Git repository slightly messed up

A picture being worth a thousand words, I'm going to start with a graph of the repository as it stands now:

There's two sort of majors problems as it stands, which can be seen in the graph:

• It looks like the changeset tagged 7.x-1.6 was pushed, but as a detached head. That means that 7.x-1.x branch on git.d.o wasn't updated ; the changeset thus can't be seen in the 7.x-1.x branch history, and the 7.x-1.x-dev release still contains the code of the 7.x-1.4 release.
• The geoPHP library was updated in the master branch only; that branch wasn't merge in the 7.x-1.x branch, which means that the geoPHP library in the 1.6 release is geoPHP 1.0, not geoPHP 1.1

The only changes between the 1.4 and 1.6 release (can be seen with git diff 7.x-1.4..7.x-1.6) is thus the tweak to geophp_requirements.