Squashed 'php/' changes from fe7a79b..aa985ef

aa985ef 7.x-1.0
861b039 rc5
b822fb8 rc3
f0018b4 Merge branch 'master' of https://github.com/pantheon-systems/drops-7
84b44a3 Merge pull request #40 from arshad/apachesolr-use-search-permissions
0fe4a0b Merge pull request #44 from jamesrward/gitignore-allow-icons-folders
35deea8 Changed Icon? to Icon/r/r in gitignore
dd33409 Changed Icon? to Icon\r\r
dd24c79 Drupal 7.31 - a security release recommended for all sites. For more information see https://www.drupal.org/SA-CORE-2014-004
54babd7 Merge pull request #41 from mparker17/pressflow-7.31
4b8efdc Drupal 7.31
1dd6902 rc3
da96052 Merge branch 'master' of https://github.com/pantheon-systems/drops-7 into rc1
32888c2 rc1 release
d0b3155 Drupal 7.30 - a bugfix release recommended for all sites. For more information see: https://www.drupal.org/drupal-7.30
02321c5 Merge pull request #39 from mparker17/pressflow-7.30
92cc103 Merge branch 'master' of https://github.com/pantheon-systems/drops-7 into rc1
d4ae123 Drupal 7.30
c27aa80 Add standard info to CHANGELOG.txt in preparation for the Drupal 7.30 release.
a422c3a Issue #2305017 by David_Rothstein, pwolanin | beech: Fixed Regression: Files or images attached to certain core and non-core entities are lost when the entity is edited and saved.
dd2fc54 Issue #2249025 by xjm, clintrandall777@gmail.com: Update Security topic coordinators section in MAINTAINERS.txt.
4f1a4c5 Issue #2012468 by joshi.rohit100, blueminds, David_Rothstein, plach | catch: Add trusted roles recommendation to 'access site reports'.
82ad452 Merge tag '7.29' into 7.x
8fbe7a8 Issue #1369822 by amitgoyal, Cottser, er.pushpinderrana: Fix docs for template_preprocess_user_profile()
02ea679 Issue #2267411 by er.pushpinderrana, amitgoyal, klausi, David_Rothstein: Document that field_access() does not check entity access
72168e4 Issue #2098129 by er.pushpinderrana, drupal_sensei, Berdir, joachim: Fix docs for DrupalDefaultEntityController entityCache variable
71d7e8e Issue #2054189 by ShaunDychko, pc-wurm, joachim: Fix docs for field_info_instance()
9a39865 Issue #2141221 by joshi.rohit100, dcam, thedavidmeister, joachim, anemes: Add docs to hook_update_N() about sandbox parameter
d67a3aa Issue #2039449 by joshi.rohit100, joachim, lokapujya, Jalandhar, paulh, yaworsk: Fix up docs for assertField and assertNoField methods
48d1c48 Issue #2290435 by PQ: Fix broken link in robots.txt file
0bc1433 Issue #1956782 by joshi.rohit100, bdimaggio, tanmayk, chertzog: Document parameter to xmlrpc_server()
90d5f49 Issue #2263047 by joshi.rohit100, lostkangaroo, sachin_s, martin107: Fix up hook_help docs and move to system module
e8db5fd Issue #2277623 by mparker17: Fix up docs for drupal_parse_url function
0411ab5 Issue #2248799 by amitgoyal, c31ck, Wim Leers: Fix docs for system_sort_themes
ceca284 Issue #2267159 by juampy, xjm, alexpott: Remove nonexistent parameter from DrupalWebtestCase::assertNoLink docs
7b10266 Issue #2273337 by vegantriathlete, ducktape, joachim: Fix up docs for db_add_field and related functions
a3b7e8b Issue #2276469 by decibel.places: Fixed robots.txt syntax checking link broken.
2679451 Issue #2268947 by sachin_s, joachim: Add note to hook_field_formatter_settings_form() about when it is invoked
0cf0190 Back to 7.x-dev
0aa1f8f Update to Drupal 7.29. More info: http://drupal.org/drupal-7.29
8ce27ef Merge pull request #38 from pressflow/7.29
3b75952 Merge tag '7.29' of http://git.drupal.org/project/drupal into 7.29
83b80ac Drupal 7.29
a5b2b85 Use administer search permission instead of access administration pages
d3d0146 update to beta22
c4541e6 Merge pull request #36 from pressflow/drupal-7.28
7e031bf 7.28 release
984c7b7 Merge pull request #35 from pressflow/drupal-7.27
9b2108d 7.27 release
a29424b Merge tag '7.26'
3feb832 committing default.settings.php.
48f8cea Merge tag 'refs/tags/7.25'
1bab4b4 Merge branch 'pressflow-7.24'
0fed473 Merge tag 'tags/7.24' into pressflow-7.24
2cd4323 Allow subsecond delays for lock_wait().
b8fae76 Merge tag 'tags/7.23'

git-subtree-dir: php
git-subtree-split: aa985efd4f990750dc95569064c71309995ef4b1
Merge commit '58466a3e7a10de1484b8ec8def2c49a065010da5'

Merge OpenPublic 1.0.