Merge branch 'phing' of github.com:tikolakin/theme into phing
Merge branch 'phing' of github.com:tikolakin/theme into phing