Merge branch 'master' of git.dolda2000.com:/srv/git/r/wrw
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 23 Dec 2012 05:45:53 +0000 (06:45 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 23 Dec 2012 05:45:53 +0000 (06:45 +0100)

Trivial merge