Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into rel_2_0
authorJason Etheridge <jason@esilibrary.com>
Wed, 14 Sep 2011 14:58:31 +0000 (10:58 -0400)
committerJason Etheridge <jason@esilibrary.com>
Wed, 14 Sep 2011 14:58:31 +0000 (10:58 -0400)
commite48918397425be84bed05d5143efe3459ea54272
treee0d0fb5b45f9c003ba32c68a5c6feb2431e1b872
parent572607f08126548c30075439e2983b9029fd205b
parent46fb4caadc58467d17f60b717358ba5dcb7c84b6
Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into rel_2_0