Merge branch 'master' of git.esilibrary.com:migration-tools
authorGalen Charlton <gmc@esilibrary.com>
Fri, 17 Aug 2012 20:11:34 +0000 (16:11 -0400)
committerGalen Charlton <gmc@esilibrary.com>
Fri, 17 Aug 2012 20:11:34 +0000 (16:11 -0400)

Trivial merge