Back to 7.x-dev
Drupal 7.18.
Merge tag 'tags/7.18' into drupal-7.18

Drupal 7.18.
Merge branch 'drupal-7.18'
Merging Drupal 7.18 from https://github.com/pressflow/7

For more information see: http://drupal.org/drupal-7.18
Merge branch 'master' of git://github.com/pantheon-systems/drops-7