Merge branch 'master' into plugin-coherence
authorRicard <email@ricardmarxer.com>
Thu, 26 May 2011 12:47:57 +0000 (14:47 +0200)
committerRicard <email@ricardmarxer.com>
Thu, 26 May 2011 12:47:57 +0000 (14:47 +0200)
commitf57a70b528d6a6139238e75dd6e8effd435fd502
treed4db7819a1621ab0503b19872d4ed0a3a563068b
parentfb9144f9625e7c6404eb71371f615df28890932a
parent8aa759d77d54675fbf0edf77ddffaef92ec6777a
Merge branch 'master' into plugin-coherence