Merge branch 'bug_5648' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 12:17:34 +0000 (08:17 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 12:17:34 +0000 (08:17 -0400)
commit1261b6878c5f8c34d277ad155857e6adfb717b25
treef3c14acd48c9d15a7cc744068acf3ef41f079417
parenteb9cff7b943034a6085023b837d24f7b87dbb63c
parent2a3341733e64104c92ccc5ac34733e1c5a24ca7d
Merge branch 'bug_5648' into 3.12-master