Merge branch 'master' of git+ssh://git.sitka.bclibraries.ca/sitka/sitka-tools
authorJames Fournie <jfournie@sitka.bclibraries.ca>
Fri, 4 May 2012 18:01:24 +0000 (11:01 -0700)
committerJames Fournie <jfournie@sitka.bclibraries.ca>
Fri, 4 May 2012 18:01:24 +0000 (11:01 -0700)

Trivial merge