Merge branch 'lapp-resilient3'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 5 Mar 2013 14:27:16 +0000 (15:27 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 5 Mar 2013 14:27:16 +0000 (15:27 +0100)
commit332f1f3f032bb8ad1285c79877555311fe4b54c4
treef3408b1ca1e2e69851de533ed609260ea9f9bde2
parent513c3cc9d6a9ab66dc2f10cc3a9b5bdfc88f9f03
parent5cc00f0048aaf36684f1cde8d4a9e21ccba6729d
Merge branch 'lapp-resilient3'