From: Tyler Riddle <t.riddle@shadowcat.co.uk>
Date: Mon, 15 Oct 2012 17:37:18 +0000 (-0700)
Subject: merged changes from master since branching
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c491d1e94d24cc42d5d6458b2c61d7cbe77ee2d4;p=scpubgit%2FObject-Remote.git

merged changes from master since branching
---

c491d1e94d24cc42d5d6458b2c61d7cbe77ee2d4