Merge branch 'bug_7593' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 14:30:57 +0000 (10:30 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 14:30:57 +0000 (10:30 -0400)
commit7ad69f58e853a36b81e4b392d2904e09d23f3563
tree957dd10243ed33ccaf350e42fd8af0f8e4a646a9
parent34d5b7de89dc394c0c71652678f5d7b7fa793e35
parent24f5525207c11401626f363faff90fa9436c1003
Merge branch 'bug_7593' into 3.14-master