Use OG 2.5
Merge 3.x
Add ER patch.
Remove flush all cache.
Update drupal-org.make

fix patch decliration
Merge branch 'SCHOLAR-3.x' into 5326-amitai
Merge branch '5326-amitai' of github.com:openscholar/openscholar into 5326-amitai
Change patch.
Merge branch 'SCHOLAR-3.x' into 5326-amitai
Merge SCHOLAR-3.x into 5326-amitai.
Merge pull request #5404 from openscholar/5326-amitai

Fix lost prepopulation