merge 'master' into apache
[slapos.git] / slapos / recipe / librecipe / __init__.py
2011-07-08 Gabriel Monneratmerge 'master' into apache