Merge branch 'master' into plugin-coherence
authorRicard <email@ricardmarxer.com>
Mon, 23 May 2011 17:37:19 +0000 (19:37 +0200)
committerRicard <email@ricardmarxer.com>
Mon, 23 May 2011 17:37:19 +0000 (19:37 +0200)
commitf94443fe828f4afb5733ee0c45e7f2b1765d1ab9
tree942dc72ffb3161486471ce120c0ddd144f499a59
parentb8c235524c1104b9f302f62ec4700b7e92861d2a
parent8ae747b84c6f10493405c4292cbf82c536b51baa
Merge branch 'master' into plugin-coherence
bin/smewg