Merge remote branch 'origin/introduce_slapos' into slapos
authorroot <root@debianOBS.(none)>
Fri, 17 Aug 2012 10:09:07 +0000 (12:09 +0200)
committerroot <root@debianOBS.(none)>
Fri, 17 Aug 2012 10:09:07 +0000 (12:09 +0200)
commit94bd7a7bbbbde0ce8c4e42b58278c833e7de30d7
treecbc1703e5d65284cde4457a956cddda9de9f9b44
parentf5b9bbc795d2eb9071c015b5e99cc522bfe03f5c
parentf647dad9e1a6552644b6024021e28fd50bf70d10
Merge remote branch 'origin/introduce_slapos' into slapos
component/slapos/buildout.cfg