Merge branch 'master' into plugin-coherence
authorRicard <email@ricardmarxer.com>
Tue, 7 Jun 2011 18:44:45 +0000 (20:44 +0200)
committerRicard <email@ricardmarxer.com>
Tue, 7 Jun 2011 18:44:45 +0000 (20:44 +0200)
commit14333a4d54c5e88bad7ebbb31d1bda1aa9a4a458
treed3fd457df9a1754e1c2a9fe2978dd16487f88ada
parent34ebf08f92df344cd21d1e9e1b2b5ab2a485248b
parent20a3d6a7085ba41195a37cef88f6ec501768dfd3
Merge branch 'master' into plugin-coherence