Merge remote-tracking branch 'EvanDotPro/feature/composer-optional'
authorRob Allen <rob@akrabat.com>
Thu, 14 Jun 2012 14:48:54 +0000 (15:48 +0100)
committerRob Allen <rob@akrabat.com>
Thu, 14 Jun 2012 14:48:54 +0000 (15:48 +0100)

Trivial merge