Merge branch 'HEAD' of git@github.com:rsoulliere/Evergreen-DocBook.git
authorHilary Caws-Elwitt <hce@epix.net>
Thu, 5 May 2011 13:56:28 +0000 (09:56 -0400)
committerHilary Caws-Elwitt <hce@epix.net>
Thu, 5 May 2011 13:56:28 +0000 (09:56 -0400)
1  2 
2.0/stafftasks/cataloging.xml

Simple merge