Merge branch 'master' into slapos slapos-0.57
authorŁukasz Nowak <luke@nexedi.com>
Mon, 7 Nov 2011 13:22:16 +0000 (14:22 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 7 Nov 2011 13:22:16 +0000 (14:22 +0100)
commit4c4b920c419915cc1ff60708d0ce1e078785caff
tree321b3d9772207d33a4090263300714a15813a003
parent052ac9612103ab8e93ab49879815f851f345c65a
parent7576c6d5bcdc45294c7c8de8730324165a99256d
Merge branch 'master' into slapos

Conflicts:
setup.py