Merge remote-tracking branch 'origin/master' into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Tue, 17 Jan 2012 12:40:01 +0000 (13:40 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 17 Jan 2012 12:40:01 +0000 (13:40 +0100)
commit61ce36c3a656f0f0436fda5dfdbe17f917a43122
treebba8324bfc88c6b1187c36af003dc533d66e260a
parentd8a84110c8ad04629ced542ba047270bf891488b
parent5179aa88c4e056f1eab89b13eab7dd7a57bd6a41
Merge remote-tracking branch 'origin/master' into erp5-generic