Merge branch 'bug_9555' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 11:40:50 +0000 (07:40 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 11:40:50 +0000 (07:40 -0400)
commitbc11d66aa8feec8f566530875506667c22b5fe88
treee54e6c061f112d4d1219317c48b0e47fce0a8a7e
parent5bdc68837b610ccef8b4b3c7c4c84b84bea20e21
parent82337d9624c0691edf572051890f164ce9b652c0
Merge branch 'bug_9555' into 3.12-master