Merge branch 'master-PrivacyLinkFix'
authorkreed <kreed@sitka.bclibraries.ca>
Wed, 4 Jul 2012 21:50:09 +0000 (14:50 -0700)
committerkreed <kreed@sitka.bclibraries.ca>
Wed, 4 Jul 2012 21:50:09 +0000 (14:50 -0700)
1  2 
js/sidebar.js

diff --cc js/sidebar.js
Simple merge