Merge branch 'master' into slapos
authorŁukasz Nowak <luke@nexedi.com>
Mon, 27 Jun 2011 07:50:04 +0000 (09:50 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 27 Jun 2011 07:50:04 +0000 (09:50 +0200)
commit970fd62a3652bdb8bfac12a98757d76c1b99e366
tree72b97fb32f67c495ad958ffcb51cc7309660f4c9
parent0e7564dffd1d446f2410acece7e47aa17f6c27d1
parent7451dbfda6b5edd15732e63841d779f4fa7b8ec6
Merge branch 'master' into slapos