Merge branch 'bug_9417' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Feb 2013 14:35:01 +0000 (09:35 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Feb 2013 14:35:01 +0000 (09:35 -0500)
commitf66162592e001bdc13dcfc5426820f7a8b915b9b
treec4efca99b4c673c00f0ce6ad87480897cba838c6
parent4da872e51f8ccf60d9f012d1490f87d6d92972d1
parent0131b9e6977214f5481221be52f597339a04e3b3
Merge branch 'bug_9417' into 3.12-master