Merge branch 'lapp-resilient3'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 4 Dec 2012 09:45:32 +0000 (10:45 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 4 Dec 2012 09:45:32 +0000 (10:45 +0100)
commitbf74c911d73aa44e00db18450688e6f14e718870
tree2d66fc1e7f9b2b28e97da3770a324bca3188fdb9
parent33c54add63159c998388bce8f4e8e020c91f0cf5
parent5cd362bf199610eb1777521d112670de441a1f65
Merge branch 'lapp-resilient3'