Merge branch 'core/1.1.3/maint' into core/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 7 Apr 2011 20:17:51 +0000 (22:17 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 7 Apr 2011 20:17:51 +0000 (22:17 +0200)
commit13cec5adcabc015959a87a75ef67cc354242a6bd
treed65c30258dbcf2ee642cf6b1ba02d58ed443e5af
parent8dd67de33d8b729b3ff0f5aae6de1dbad9f3f30d
parentcab6c1c15dfa75c04b433447e608edb59171c376
Merge branch 'core/1.1.3/maint' into core/master