Merge remote-tracking branch 'origin/resiliency_annotated' into lapp-resilient2
authorMarco Mariani <marco.mariani@nexedi.com>
Thu, 22 Nov 2012 15:47:10 +0000 (16:47 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Thu, 22 Nov 2012 15:47:10 +0000 (16:47 +0100)
commit69b1df32dfe68f809003a8e557fd0fac7f3862ed
tree39adb7dc37647ddf7a83977486c7197336cdd4c6
parent944d97c21f5ebf157a79fcaa9f1b34223b516602
parent9ef171f879836a30c27aba187be705b7e06c2cf9
Merge remote-tracking branch 'origin/resiliency_annotated' into lapp-resilient2