Merge branch 'slaprunner-resiliency'
authorCédric Le Ninivin <cedric.leninivin@tiolive.com>
Tue, 16 Jul 2013 10:16:09 +0000 (12:16 +0200)
committerCédric Le Ninivin <cedric.leninivin@tiolive.com>
Tue, 16 Jul 2013 10:16:09 +0000 (12:16 +0200)
commit30f81509d71fbadff73313b1b704c0ca7b222d33
tree0c6523893e7cfe832cdc4526dc2fdffbb1d70122
parent852af49b02be838689637598c1298e73f945b7ea
parent661296d2aef5975ffeac37cfd4d896035fc04339
Merge branch 'slaprunner-resiliency'