Merge branch 'master' into plugin-coherence
authorRicard <email@ricardmarxer.com>
Tue, 24 May 2011 21:18:00 +0000 (23:18 +0200)
committerRicard <email@ricardmarxer.com>
Tue, 24 May 2011 21:18:00 +0000 (23:18 +0200)
commitfb9144f9625e7c6404eb71371f615df28890932a
tree4f95c3a6ba3045a6490f86f752d16c551f97bc4a
parentf94443fe828f4afb5733ee0c45e7f2b1765d1ab9
parenta239a97629bab98f83b48bb62b686f6b7e9df3f1
Merge branch 'master' into plugin-coherence