Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into circ_config_policy circ_config_policy
authorJoseph Lewis <joehms22@gmail.com>
Thu, 23 Jun 2011 18:48:36 +0000 (12:48 -0600)
committerJoseph Lewis <joehms22@gmail.com>
Thu, 23 Jun 2011 18:48:36 +0000 (12:48 -0600)
commit1290cde019a04d13b6ad949a7ccc3e948e4bf654
treec29a355c0071d2e5154f3719f98e02808b79a291
parentd1cb22e53f92f86cd2d92646b0f8d5b278b843b7
parent2d096d936c4467ae407bc2c8ade02d96aa3e752b
Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into circ_config_policy