Merge branch 'master' into slapos
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 16 May 2012 18:31:06 +0000 (20:31 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 16 May 2012 18:31:06 +0000 (20:31 +0200)
commit1d4e75ffea70496f9d55f3802ff451284a870c1c
tree55e30f44d9bee297c845f09017e86e3486cdbf8c
parent8a6a1b1aef1ecf181d3bad44e7f56ba8ff8cd7b6
parent821b20138bc418661a083948948e50f406e19740
Merge branch 'master' into slapos