Merge branch 'apache-reload' into lapp-resilient3
authorMarco Mariani <marco.mariani@nexedi.com>
Fri, 14 Dec 2012 15:01:05 +0000 (16:01 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Fri, 14 Dec 2012 15:01:05 +0000 (16:01 +0100)
commit10f72b63a05d5b52c4cf22349e10a32383b516a1
treeae5491b6b22dbb72f4a3a513e652de8f5a865987
parent3df8854b99b9846c91e1d8f3e8610772c011b4d6
parent9e1711abcebffb3d486d7ce3fd71d2f45119ac7e
Merge branch 'apache-reload' into lapp-resilient3