Merge branch 'master' of git+ssh://git.sitka.bclibraries.ca/sitka/sitka-tools
authorJames Fournie <jfournie@sitka.bclibraries.ca>
Thu, 23 Feb 2012 20:04:31 +0000 (12:04 -0800)
committerJames Fournie <jfournie@sitka.bclibraries.ca>
Thu, 23 Feb 2012 20:04:31 +0000 (12:04 -0800)

Trivial merge