branches - back to working on master

[Dirk Hohndel]

Just in case this isn't obvious (and my guess is, it isn't).

With the change in direction (focus on Subsurface 2.1 - to be released
soon with more than ten languages supported) and the merge of all the
localization changes into master, the 2.x branch and gettext branch are
now obsolete and won't be maintained anymore. I'll remove them from the
servers eventually...

So all work should be relative to master again.

/D