merge master into grid-computing-merge
authorAlain Takoudjou <talino@tiolive.com>
Thu, 14 Feb 2013 12:19:07 +0000 (13:19 +0100)
committerAlain Takoudjou <talino@tiolive.com>
Thu, 14 Feb 2013 12:19:07 +0000 (13:19 +0100)
commit5d65d899d8f5c1c31cbb9738556e00b28c394a96
tree6d8ee7a3d859d06278681061402b6e9e79310682
parent2fc0ece1371ec60c9d176f14146958e8c408d0a6
parente76f9575132d5c80f4130872c4ad3afc82160301
merge master into grid-computing-merge
setup.py
slapos/recipe/apachephp/__init__.py