in git-describe, only match main tags, not side tags like debian/* which does its own thing
add some more conditional compilation stuff to make things work for firefox 27+
Merge branch 'master' into debian
new changelog entry
- drop obsolete use of Conflicts
- add a watch file