Merge branch 'bug_8054' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 12:14:24 +0000 (08:14 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 12:14:24 +0000 (08:14 -0400)
commit43c340c53ebf021db9600f2645d3349885f789af
tree4ee0bdee72788c46e950c5c680cd21d1db387e3f
parent415af04cd782d3897e4c5736f723a40d18638062
parent6c6fe37ced41a7acd96974d38d1af4657297fd1e
Merge branch 'bug_8054' into 3.12-master