Merge branch 'slapos' slapos-0.3
authorŁukasz Nowak <luke@nexedi.com>
Wed, 1 Jun 2011 08:34:05 +0000 (10:34 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Wed, 1 Jun 2011 08:34:05 +0000 (10:34 +0200)
commit801f4a492005d6795fa630e4916964a31d35495d
tree89b89a1173996a95a7b194dfcdabaffc3802b7fe
parentf99e6daa05a91392cf2d34318029b93d62c94647
parent63d07f4aa7c091295e98c4509ce6e6590bb5afa7
Merge branch 'slapos'