Merge remote branch 'origin/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 19 May 2010 14:49:40 +0000 (16:49 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 19 May 2010 14:49:40 +0000 (16:49 +0200)
commit706f13fcd7c0f729c25b6c1c40309243e106111c
treec990de51344cdaec8bdbecc912919bcd0ac5e529
parent4e07bb85854a395d92d93eabc29089d02cb2a5a0
parent903e1f5e0248cb7e0f98d1b1e824e3b1b6c644e3
Merge remote branch 'origin/master'