Merge remote-tracking branch 'EvanDotPro/feature/configurable-glob-paths'
authorRob Allen <rob@akrabat.com>
Sat, 19 May 2012 17:58:36 +0000 (18:58 +0100)
committerRob Allen <rob@akrabat.com>
Sat, 19 May 2012 17:58:36 +0000 (18:58 +0100)

Trivial merge