Merge remote-tracking branch 'origin/master' into dev/am123 am123_prod_110905
authorClaire Hernandez <claire.hernandez@biblibre.com>
Fri, 2 Sep 2011 12:54:51 +0000 (14:54 +0200)
committerClaire Hernandez <claire.hernandez@biblibre.com>
Fri, 2 Sep 2011 12:54:51 +0000 (14:54 +0200)
commite11cb1555c28a496a33601e8818a8e773c138cbd
tree69ce011d5e2e1a819eeb503bb8321d22b0f9a3db
parent5d32cb7ed06750ee0f1c872d37e88766215692ec
parent491e5d9dfa7155a11777cf33ac8d041de244ea58
Merge remote-tracking branch 'origin/master' into dev/am123