Merge branch 'master' of http://git.roojs.com:8081/Pman.Core
authorElliott Polk <elliott.polk@thekaroshiworkshop.com>
Thu, 24 May 2012 09:51:39 +0000 (17:51 +0800)
committerElliott Polk <elliott.polk@thekaroshiworkshop.com>
Thu, 24 May 2012 09:51:39 +0000 (17:51 +0800)

Trivial merge