Viewing all changes in revision 82.

Committer: Guillaume Hain
Date: 2012-08-31 09:41:51 UTC
mfrom: <a title="Merged From 80.1.5" href="/~zedtux/naturalscrolling/trunk/revision/80.1.5">(80.1.5)
Revision ID: git-v1:9ef7d6b00bb058ecff2b176dd0cb0685246018f2

Merge branch 'master' of github.com:cemmanouilidis/naturalscrolling

Conflicts:
messages.pot

added added

removed removed

~zedtux/naturalscrolling/trunk