Merge branch 'user/jboyer/claimsret_counts' of git.evergreen-ils.org:working/Evergree... user/jboyer/claimsret_counts
authorJason Boyer <jboyer1@library.in.gov>
Thu, 4 Sep 2014 18:19:00 +0000 (14:19 -0400)
committerJason Boyer <jboyer1@library.in.gov>
Thu, 4 Sep 2014 18:19:00 +0000 (14:19 -0400)
commitbe48410088a48f023bc663192346c9876588d15b
treeb5cabd582338285132be8c789bbbad25fcd543c2
parentc1e920502ded6266a322758d8964e2f96b0adbbd
parent9416804376c876f6334902eb0aec159782e3e1bb
Merge branch 'user/jboyer/claimsret_counts' of git.evergreen-ils.org:working/Evergreen into user/jboyer/claimsret_counts

Conflicts:
Open-ILS/examples/fm_IDL.xml