Merge branch 'master' into slaprunner
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 15 Jun 2012 12:41:48 +0000 (14:41 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 15 Jun 2012 12:41:48 +0000 (14:41 +0200)
commitbee34cb6bac8b04e0c0d8c8a6a8dc8b03e4463bb
tree0aa9118d6ca65d7e518b8fe99e0b3f362fc1068e
parentd93ec17e831f56cd981190f02a93778497fe9116
parentf9e6239b0ab6f636259020dc55c4a25a8ed8e50e
Merge branch 'master' into slaprunner