Merge branch 'master' into slapos
authorŁukasz Nowak <luke@nexedi.com>
Thu, 24 Nov 2011 09:41:42 +0000 (10:41 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Thu, 24 Nov 2011 09:41:42 +0000 (10:41 +0100)
commit50e8fc75bbb9ca457726811affc0b7835c3a9ce4
tree1849b883cb6db70425d6fef2108606c6fbfb312c
parentdf70917dc16c4a48913daf2285690c83c3c743be
parentff5c054a1b8185155ea7dbd42485a7017e7c9f3b
Merge branch 'master' into slapos