Merge branch 'apache' slapos-0.73
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 1 Mar 2012 11:03:56 +0000 (12:03 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 1 Mar 2012 11:03:56 +0000 (12:03 +0100)
commit9012426b590bf7163a7d8046ce8c50a563c24ca6
tree20665384f17ce311a4924290d4c2dfb3b442f27f
parentd797625189625265982f44dca5fe9aefcbde92ce
parentf65cc0b435cc849a3751cf5d7982baf5e912e2db
Merge branch 'apache'