Merge branch 'master' of git.dolda2000.com:/srv/git/r/wrw
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 6 Nov 2011 19:56:52 +0000 (20:56 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 6 Nov 2011 19:56:52 +0000 (20:56 +0100)

Trivial merge