Merge branch 'lapp-resilient3'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 13 Dec 2012 15:18:33 +0000 (16:18 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 13 Dec 2012 15:18:33 +0000 (16:18 +0100)
commit6db4a37f31fedcc50a029a633e9c3f6a7c323f26
tree5ddbe09f25b250d55665e4ed7b6754eafbbde2b2
parentd5dac84dde6978ef770c6d87b5a693896eee3b94
parent3b51b3323ba973717e1607d24cc0440a0f3c1b9e
Merge branch 'lapp-resilient3'