Updated some strings and logic for screen-scraping
Upstream branch should not include the debian/ directory
Merge branch 'upstream'

Conflicts:
	debian/changelog
The debian/ directory should only be present in the Debian branch (master)
Imported Upstream version 1.7
Merge tag 'upstream/1.7'

Upstream version 1.7

# gpg: Signature made Mon 25 Nov 2013 02:41:54 PM CST using RSA key ID C1DB921F
# gpg: Good signature from "Gunnar Eyal Wolf Iszaevich <gwolf@debian.org>"
# gpg:                 aka "Gunnar Eyal Wolf Iszaevich <gwolf@gwolf.org>"
# gpg:                 aka "Gunnar Eyal Wolf Iszaevich (Instituto de Investigaciones Económicas UNAM) <gwolf@iiec.unam.mx>"
Drupal.org updated from 6.x to 7.x, screen scraping logic had to be updated.

* Drupal.org updated from 6.x to 7.x, screen scraping logic had to be
  updated.
* Thanks to Stefan Hornburg and Stefan Kangas for almost
  simultaneously reporting the issue!