Merge branch 'drupal'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 18 Jun 2012 12:34:48 +0000 (14:34 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 18 Jun 2012 12:34:48 +0000 (14:34 +0200)
commitc2438f6c4b8708a8050d045b02aa6bcbe7c180d7
tree1035c0459ff44836a0d49e6167eeba54c1787108
parentd1f6731d3cbf01744662c296f1a356100f47e3e1
parent8b7574b3c8583f1cf36c257929a97d3face84346
Merge branch 'drupal'

Conflicts:
slapos/recipe/request.py
stack/lamp/buildout.cfg