Merge branch 'revert-lp954310'
authorBill Erickson <berick@esilibrary.com>
Mon, 2 Apr 2012 17:25:54 +0000 (13:25 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 2 Apr 2012 17:25:57 +0000 (13:25 -0400)
commit1257ffe6071a2f9d77bb877f0fd6506edb88c11f
treedf607394c48e2256044fb90bbd3e2888a809ae31
parentd5353f6cfee00eabfed3787275f3a83b21cbc61a
parentd22edb0073cbf85a2e9269e6049ed699f05456b7
Merge branch 'revert-lp954310'

Reverting commits from LP 954310, since the wrong branch was merged.

Signed-off-by: Bill Erickson <berick@esilibrary.com>