Merge branch 'master' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Mon, 17 Oct 2011 07:51:21 +0000 (09:51 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 17 Oct 2011 07:51:21 +0000 (09:51 +0200)
commit0e9dd5bfc487d2b4b9e1305af58c4aa3f5492e7b
tree662ecef57d68ad476d43de93485b074301ad41de
parentd38ce2ac34c736a1ccdf7a8e1709b53b9e00f3d2
parent6d4265e4ba4424d435d1f749e1d40a54a380dacb
Merge branch 'master' into erp5