Merge branch 'bug_9496' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 02:25:09 +0000 (22:25 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 02:25:09 +0000 (22:25 -0400)
commit784046a7754b5eed5e1175b2697aa08ef569bf33
tree9539017f189d89a05acbc7d6eabe2c11986f3f11
parent607b4e7745e830e14906d47e3c4a8e13b23d6fea
parent151e22070a189f10dd38e53a1636110a72066fe3
Merge branch 'bug_9496' into 3.12-master