Merge branch 'bug_9676' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:20:41 +0000 (10:20 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:20:41 +0000 (10:20 -0500)
commit2bb2b58afb2095e169633b30eece097e9cee5807
tree678a9f7613fd6c703f609653e61c17d58231db6c
parentb631b164700c3ee10308d83570c1eef2973fa335
parentaa6764f37e4cb675bbdc257133967bb845220993
Merge branch 'bug_9676' into 3.12-master