Merge branch 'lapp-resilient4'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 12 Feb 2013 12:52:08 +0000 (13:52 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 12 Feb 2013 12:52:08 +0000 (13:52 +0100)
commit607cda473c51a3d4d47221a933fbdaaa1a5674a9
tree7a1ba60ef740c8aa5f2987212aff253f8bedf7ea
parentc12dcb9e808d542c4cddd5e7b782835fda16c89a
parent140206565a6f40e681bc488df8d33efade83ba39
Merge branch 'lapp-resilient4'