Merge branch 'bug_7688' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 02:23:16 +0000 (22:23 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 02:23:16 +0000 (22:23 -0400)
commit60508cb03d825f515461c1898361ac0eb3cffb2b
treedb33f2a2d4eb81ff6163b26347b7c9089b4d2a99
parent8579d07f1474a2393e518b66e9aa6c3464ab2e81
parent246c133af3861f8a8b716f196e04c2185efe7799
Merge branch 'bug_7688' into 3.12-master