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)
commit9feae4d88cdb7d507e7e2159975178e4b431a8de
treef8c514054e15a530125d15570cde011b06d80a38
parent05530a7c8e4711772a20411615ea52254d6dc557
parent842ceb0a577a3de5e82fcadef3da1630314dafc1
conflict resolving: Merge branch 'master-jan11-2013-phone-extention-fix'

Conflicts:
js/holds.js
js/holds.js