Merge branch 'bug_9059' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:34:00 +0000 (18:34 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:34:00 +0000 (18:34 -0500)
commitdb15627b7a6f8bb61f408e20b14bafd901e65cf7
tree46fe7a38d8cc519cc0caf618b7108986cc16374f
parent85c4cd4712026a554817564dcd7fea70a27ad0e1
parentdf1db0d4dc6661d20717cc2299ca89a5055c8743
Merge branch 'bug_9059' into 3.12-master