Merge branch 'erp5' slapos-0.6
authorŁukasz Nowak <luke@nexedi.com>
Tue, 14 Jun 2011 13:09:57 +0000 (15:09 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 14 Jun 2011 13:09:57 +0000 (15:09 +0200)
commit2764645dba14e448c9cdec0e4d73d8062ddfe0a0
tree25ba59df366d6e7ca45e143829b659012f4aa24c
parentfa780fd183d8d583dae4c60b670cacae841cb962
parent139cb71831a17fe1edb73d8db64dd0d3653c7dd6
Merge branch 'erp5'