Merge branch 'core/1.1.2/maint' into core/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Sun, 30 Jan 2011 22:46:40 +0000 (23:46 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Sun, 30 Jan 2011 22:46:40 +0000 (23:46 +0100)
commit5efd40f4da01f00a042e4cac5881242889077132
tree31538b7259ad33c4d2fe62ff7291f92dcc9e2953
parent31dc3dd3cdae22485061c3a1b6accdd732207dd4
parent9261ede012d3edda638f614494df31e876e8d758
Merge branch 'core/1.1.2/maint' into core/master