Merge branch 'erp5' into vifib
authorŁukasz Nowak <luke@nexedi.com>
Mon, 13 Jun 2011 09:14:25 +0000 (11:14 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 13 Jun 2011 09:14:25 +0000 (11:14 +0200)
commit91b71cc311d25d482842472f129e42cc79a5d65b
tree1a45aa3c8a509fdc58c8032b05f0de0305588e81
parent46f0f8f18c7fd64f8f35e1aad9edf38f2918c7f1
parentc3a2a84696b778e944e9c90dacd5a8d7afb5ae37
Merge branch 'erp5' into vifib