Merge branch 'master' into bclibraries bclibraries-eg22-3 master-PrivacyLinkFix
authorkreed <kreed@sitka.bclibraries.ca>
Wed, 4 Jul 2012 21:50:29 +0000 (14:50 -0700)
committerkreed <kreed@sitka.bclibraries.ca>
Wed, 4 Jul 2012 21:50:29 +0000 (14:50 -0700)
commit24c81bc142994a66822944d90f1b8a4dbf8e1854
tree94f9b0e6617b5fc08e41fa561cd943a572e1f229
parent2a3d12b39e0e8c46c707f8e1bef9b8f231919da9
parent9335a674a23c018f64f3d1d22b58fa13757fd96d
Merge branch 'master' into bclibraries