Merge remote-tracking branch 'origin/master' into html5as
authorŁukasz Nowak <luke@nexedi.com>
Tue, 28 Aug 2012 14:10:12 +0000 (16:10 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 28 Aug 2012 14:10:12 +0000 (16:10 +0200)
commit142a07120e490c0da5d2d1ce96f43028afd964af
treed9a5610940185f439f3c83148106532014b3d470
parent10796edbe2f06428129f293adfaa70fa01d83f68
parent8e49e678f93280f2954a2f133c56c8740b579264
Merge remote-tracking branch 'origin/master' into html5as

Conflicts:
CHANGES.txt
component/tar/buildout.cfg
setup.py
slapos/recipe/downloader.py
slapos/recipe/gitinit.py
slapos/recipe/librecipe/execute.py
software/gitrepo/git-http-backend.cgi.in
software/gitrepo/gitweb.cgi.in
software/gitrepo/gitweb.conf.in
software/gitrepo/httpd.conf.in
software/gitrepo/instance-gitrepo.cfg
software/gitrepo/software.cfg
software/lxc/instance-lxc.cfg
software/lxc/lxc.conf.in
software/lxc/software.cfg