Merge master into grid-computing
authorAlain Takoudjou <talino@tiolive.com>
Fri, 17 May 2013 11:37:31 +0000 (13:37 +0200)
committerAlain Takoudjou <talino@tiolive.com>
Fri, 17 May 2013 11:37:31 +0000 (13:37 +0200)
commita8c6cb9c908b838ab56167fb6189b7287bcd3bab
tree7b9f203007abda7ec58c1354f8710a56ffe5b8ba
parent3d4fc8ecaa2f71132d4da4cbc0ecba45ba29be17
parent0fe04ddaf40baf76187caddbde34b1bbf919f9a9
Merge master into grid-computing
component/gnutls/buildout.cfg
setup.py
slapos/recipe/apachephp/__init__.py
slapos/recipe/check_page_content/__init__.py
slapos/recipe/librecipe/generic.py