Merge branch 'master' into new/bug_7164
authorPaul Poulain <paul.poulain@biblibre.com>
Wed, 14 Dec 2011 14:35:39 +0000 (15:35 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Wed, 14 Dec 2011 14:35:39 +0000 (15:35 +0100)
commit3f2fe181af3d55af1f085aa379810b81a6c8ccbb
tree0671c379e3b7aec84925ef45873ff4eace57b11c
parent898ab7318b419dc2322f8050bd572daf3d5e74d6
parent82ed4696321df9b3f4e16b759b1e1a083a5c5e28
Merge branch 'master' into new/bug_7164