Merge branch 'bug_8117' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 2 Dec 2012 14:21:50 +0000 (09:21 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 2 Dec 2012 14:21:50 +0000 (09:21 -0500)
commitea1aa7a0d906d583375618e37be60e9f0d62d939
tree460272baf368fb253eadcb6561a7ae787be906df
parentaeb48e2534663e36e488713feaac96dd794836ab
parentac58b97ce13451cf0506556e239fbe299eb5494a
Merge branch 'bug_8117' into 3.12-master