From: Jason Boyer <jboyer1@library.in.gov>
Date: Thu, 4 Sep 2014 18:19:00 +0000 (-0400)
Subject: Merge branch 'user/jboyer/claimsret_counts' of git.evergreen-ils.org:working/Evergree... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fjboyer%2Fclaimsret_counts;p=working%2FEvergreen.git

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
---

be48410088a48f023bc663192346c9876588d15b