Merge branch 'master' into slapos
authorŁukasz Nowak <luke@nexedi.com>
Mon, 27 Jun 2011 07:03:59 +0000 (09:03 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 27 Jun 2011 07:03:59 +0000 (09:03 +0200)
commit3fb799fd77650abb95bf5be8c582392161821320
tree6bd02b46a6ebeab7f41a9d7e2e115caf52d640eb
parentcb83ddbc4cdd45f59533da2af969769edd273d01
parentbb12f8355e366fb958ffbe1b8f7a752cbea5873d
Merge branch 'master' into slapos