Merge branch 'master' into slapos
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 24 Jan 2012 18:30:14 +0000 (19:30 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 24 Jan 2012 18:30:14 +0000 (19:30 +0100)
commitcfd63e78065958c8a031ca9e880220ef06fccce1
tree6cc17a0b6d102e7e8d44fdc5f5a50de3dc1202d8
parentea3ab73eaf01f8a385e0eb1185f4d77ba2c53930
parentf047f2d4a9164816761b9f4d679c3d656660bd39
Merge branch 'master' into slapos

Conflicts:
component/slapos/buildout.cfg