Merge branch 'master' into slapos slapos-0.32
authorŁukasz Nowak <luke@nexedi.com>
Fri, 19 Aug 2011 12:26:30 +0000 (14:26 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Fri, 19 Aug 2011 12:26:30 +0000 (14:26 +0200)
commitaa0a88f3a9c7db57b123bc133c7f9a5be2da4a51
tree1c6636825fdae2abd727f1fed984bbb217f315b3
parentc75131ea1156f9ca944c9a2e2334183cdc96c2ad
parent6d393215a3520bd2316bec762f4f77145f1818a2
Merge branch 'master' into slapos