Merge remote branch 'origin/master' into slapos
authorroot <root@debianOBS.(none)>
Fri, 17 Aug 2012 10:09:19 +0000 (12:09 +0200)
committerroot <root@debianOBS.(none)>
Fri, 17 Aug 2012 10:09:19 +0000 (12:09 +0200)
commit954c9aa8bdf213e27edbc26fa8d44d0dd01c3cd5
tree475c4645e252f4037a090189c1ddfec58c6ac0e3
parent94bd7a7bbbbde0ce8c4e42b58278c833e7de30d7
parent376f1f112b888d87d65449fb278bbeae31e3ccc0
Merge remote branch 'origin/master' into slapos