Fwd: Staging/Master Merge - James' Patchy

[James]

I might have some internet issues at home. Patchy hasn't pushed since
midday or emailed until now. I cannot remember what the message is if
it 'fails' to connect to the internet - I think it posts this generic
message.

I'll check when I get home, there are no commits I can see in master
or staging since yesterday. So this is probably just an internet
connection glitch.

James


---------- Forwarded message ----------
From:  <address@hidden>
Date: 3 April 2012 17:31
Subject: Staging/Master Merge - James' Patchy
To: address@hidden, address@hidden
Cc: address@hidden


*** FAILED STEP ***

       merge from staging

       maybe somebody pushed a commit directly to master?