Merge branch 'bug_8546' into 3.12-master
commit560e2d7f6739f6f5112d32725ae1c82f1beedf73
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 18:02:31 +0000 (23 13:02 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 18:02:31 +0000 (23 13:02 -0500)
tree0624de5f58067b512efed92a2441eac013ce583d
parent19ce907384fa3ae351e0ca3921b52dc40fa5e1b8
parent8c1aa96d02e9c0cc8b9389213ad0b1a496172d29
Merge branch 'bug_8546' into 3.12-master