Merge branch 'master' into slapos
authorŁukasz Nowak <luke@nexedi.com>
Mon, 11 Jul 2011 11:44:31 +0000 (13:44 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 11 Jul 2011 11:44:31 +0000 (13:44 +0200)
commit6bbfc2bdc0879a20cafba7016f93c6e406126018
tree6113ec3e7b7d65e08c73a0ff334d68475e34e1ba
parent0b6fe99651c901fe3fa40a79753964d90dd59ad1
parent07e8885d160a45eaf456c606d1dbeeca3ef986df
Merge branch 'master' into slapos