Merge remote-tracking branch 'tadl/rel_2_5' into tadl_2_5
authorGalen Charlton <gmc@esilibrary.com>
Thu, 26 Dec 2013 20:14:02 +0000 (20:14 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Thu, 26 Dec 2013 20:14:02 +0000 (20:14 +0000)
Conflicts:
README


Trivial merge