Merge branch 'master' into nbd slapos-0.29
authorŁukasz Nowak <luke@nexedi.com>
Fri, 15 Jul 2011 16:24:52 +0000 (18:24 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Fri, 15 Jul 2011 16:24:52 +0000 (18:24 +0200)
commitacf9038a780adb613477b78178d8350aa2cd1583
tree61de2621ba3305d0b0c271b3e4814ad15579dd00
parente76f29e86f524c90eebc07add9ae9dbfb08bae98
parentcfce5320fec1aa03d47c692e3f75584d3f7d9ac2
Merge branch 'master' into nbd