Use administer search permission instead of access administration pages
Drupal 7.31
Merge pull request #41 from mparker17/pressflow-7.31

Pressflow 7.31
Drupal 7.31 - a security release recommended for all sites. For more information see https://www.drupal.org/SA-CORE-2014-004
Changed Icon? to Icon\r\r
Changed Icon? to Icon/r/r in gitignore
Merge pull request #44 from jamesrward/gitignore-allow-icons-folders

Changed Icon? to Icon\r\r
Merge pull request #40 from arshad/apachesolr-use-search-permissions

Use administer search permission instead of access administration pages
Merge pull request #40 from arshad/apachesolr-use-search-permissions

Use administer search permission instead of access administration pages

Was: Merge branch 'master' of git://github.com/pantheon-systems/drops-7
adds settings.php