openscholar/openscholar — pull request #1780 by baisong (2013-02-25 21:18:19+00:00)
Title: fix merge for 3.3

#1527