Merge remote branch 'origin/master' into xorg/f/surveys xorg/f/surveys
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 19 Jun 2011 15:27:21 +0000 (17:27 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 19 Jun 2011 15:27:21 +0000 (17:27 +0200)
commitc8254ce32eb6f99075f968a8a8e6a0a63bac6bef
tree12e6a6a60c5d7e3e7a47339cd1ae9e02086c2326
parente9f4dfaec1639c75ab187fba5f59aab7ecf87fe3
parentdcf173d8f864cdc3a45847f8ba5d64ae0e86e42f
Merge remote branch 'origin/master' into xorg/f/surveys