From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 6 Jun 2011 20:02:44 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 2.0101~9
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=05e1f0c7330905c92dc7fe3fd6c597ab6e1f8aed;p=gitmo%2FMoose.git

Merge remote-tracking branch 'origin/master'
---

05e1f0c7330905c92dc7fe3fd6c597ab6e1f8aed