resolve merge conflict
authorJason Etheridge <jason@esilibrary.com>
Mon, 5 Aug 2013 19:00:14 +0000 (15:00 -0400)
committerJason Etheridge <jason@esilibrary.com>
Mon, 5 Aug 2013 19:00:14 +0000 (15:00 -0400)
commit79fdd7e0eb006ebe44b5925804ea9c4b5e6ad8e5
treec8f0e6f8e3f18594013be368500b19d96504f02d
parenta978c2d37ab57a04d6ad57afd7415b6be347154d
parent74ab2bd53a6f59bbda3cfe64a31c3af157004953
resolve merge conflict