Merge branch 'bug_8917' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 16:16:51 +0000 (11:16 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 16:16:51 +0000 (11:16 -0500)
commit2bd3c85961ca878376f524c448d7ffb48bd7dfc3
tree682811cad8dac560d5d1091583688f98d74f7606
parent00b0b7b5efc615e3249fcc974170993e6ca5b847
parent65522e25ca8dd90b52e206288b6d0e51213a5b63
Merge branch 'bug_8917' into 3.12-master