Merge branch 'master' of git+ssh://git.sitka.bclibraries.ca/sitka/sitka-tools
authorMark Bucholtz <mbucholtz@sitka.bclibraries.ca>
Tue, 12 Aug 2014 19:27:18 +0000 (12:27 -0700)
committerMark Bucholtz <mbucholtz@sitka.bclibraries.ca>
Tue, 12 Aug 2014 19:27:18 +0000 (12:27 -0700)

Trivial merge