Merge branch 'drupal2' slapos-0.133
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 30 Oct 2012 10:20:11 +0000 (11:20 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Tue, 30 Oct 2012 10:20:11 +0000 (11:20 +0100)
commitcbb07be44e38e70ab7a2749d9b60b034ab8ab376
tree0ae3803811093a8ed315aa3a4e71d393b17b9922
parent5e792b1064d903e0b703962be9831dd746608100
parent47dedac9df8280f408e0a9ec87de40cf48ecda04
Merge branch 'drupal2'

Conflicts:
software/drupal/software.cfg