Merge branch 'bug_6945' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 12:38:55 +0000 (07:38 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 12:38:55 +0000 (07:38 -0500)
commitef96f0686dbf76bcf133a1923693f30e2ea7212a
tree806f413c77cfaf311301b1c7d27fd059859da7e2
parent1167677f4b3f875f0a80a00bb2917c3e9ebebf25
parent880e3b805b0e2a27052a2900b915eefa2edd03f7
Merge branch 'bug_6945' into 3.12-master