Merge branch 'bug_6554' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 1 Apr 2013 22:52:41 +0000 (18:52 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 1 Apr 2013 22:52:41 +0000 (18:52 -0400)
commit9c0b2e408b496b999cdbede92e651f3aef588209
tree80dcaf81d5d6c883b49f9dfae8fbc8a45fa3e051
parent65ea963e5217b1e955e404ea1c09928f6b259110
parentf257944d10c2660e7d7297768af314985c80a1c7
Merge branch 'bug_6554' into 3.12-master