conflict resolving: Merge branch 'master-jan11-2013-phone-extention-fix' master
authorkreed <kreed@sitka.bclibraries.ca>
Mon, 11 Feb 2013 19:56:23 +0000 (11:56 -0800)
committerkreed <kreed@sitka.bclibraries.ca>
Mon, 11 Feb 2013 19:56:23 +0000 (11:56 -0800)
Conflicts:
js/holds.js

1  2 
js/holds.js

diff --cc js/holds.js
Simple merge