Merge branch 'master' into plugin-coherence
authorRicard <email@ricardmarxer.com>
Fri, 3 Jun 2011 16:29:09 +0000 (18:29 +0200)
committerRicard <email@ricardmarxer.com>
Fri, 3 Jun 2011 16:29:09 +0000 (18:29 +0200)
commit34ebf08f92df344cd21d1e9e1b2b5ab2a485248b
treecdaa82424d811606e633d13419671fd935160d08
parentf57a70b528d6a6139238e75dd6e8effd435fd502
parentbefeea20f2c6e59141d5c39a967b8826e900d733
Merge branch 'master' into plugin-coherence
bin/smewg