Merge branch 'slapos' into networkcache_signature
authorŁukasz Nowak <luke@nexedi.com>
Thu, 25 Aug 2011 09:14:54 +0000 (11:14 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Thu, 25 Aug 2011 09:14:54 +0000 (11:14 +0200)
commitecb490666155ef53f8a18212ac55aced6a24f672
tree5ae9ab0c4a5de3e1c195f422df60615cb071ee27
parent4958df8cdb68a29637909d3dc114e3445a04aee8
parent188801714c569c2555d974cb424dc01088298048
Merge branch 'slapos' into networkcache_signature

Conflicts:
component/slapos/buildout.cfg