]> git.evergreen-ils.org Git - working/Evergreen.git/commit - build/i18n/po/opac.js/fr-CA.po
Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook into doc_consolidati...
authorDan Scott <dscott@laurentian.ca>
Mon, 21 May 2012 02:35:54 +0000 (22:35 -0400)
committerDan Scott <dscott@laurentian.ca>
Mon, 21 May 2012 02:35:54 +0000 (22:35 -0400)
commit64daed36a684bb1e7e833ba6e23e67e653593c86
tree5fc4864b79a76947a6214958e730771de8d66f64
parentf2a11f55a53d3f5a5af1510a4d1016711e0763da
parent8f88ffb5e0f9dafd83370e6bfcc3336c5561ce51
Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook into doc_consolidation_master

Conflicts:
README

Signed-off-by: Dan Scott <dscott@laurentian.ca>