Merge branch 'bug_9526' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Feb 2013 16:19:45 +0000 (11:19 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Feb 2013 16:19:45 +0000 (11:19 -0500)
commit820d57109653e422683597160d6e0457ca16f0cc
tree981526d6c1e1d5393dc78ee2a434001c821d50d9
parent8a1bb78164bf6e88902031b70af9a27070147edf
parent4284cbf206279f8974d9e3f2a0b48d0eb5e4fbe7
Merge branch 'bug_9526' into 3.12-master