Merge branch 'bug_7596' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 23:03:55 +0000 (19:03 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 23:03:55 +0000 (19:03 -0400)
commitdeb77c1e547284eb85925ae1a064341189f8df38
tree57ccf180243ef9f7b4f07e229c96d1594211868d
parentc7e986536efa399945c4cf41fb9cc5e17db291a1
parenta9f743485f96d94645b4db52aedfc9805a16d083
Merge branch 'bug_7596' into 3.12-master