Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into circ_config_policy
authorJoseph Lewis <joehms22@gmail.com>
Wed, 22 Jun 2011 17:47:59 +0000 (11:47 -0600)
committerJoseph Lewis <joehms22@gmail.com>
Wed, 22 Jun 2011 17:47:59 +0000 (11:47 -0600)
commit91c684a390844633a71ae57d88e8b3343f0ce8fa
tree9fbf139756d276f0ec23f090f4340b8c87fefd21
parentd06175491845ad2e1331b1a748bd07db7863ee60
parent9544ad05dc0d30ed5782b528fac3e2bdfa90e4dd
Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into circ_config_policy

Conflicts:
Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2

Signed-off-by: Joseph Lewis <joehms22@gmail.com>
Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2