Merge branch 'master'
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 23 Mar 2014 01:35:22 +0000 (02:35 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 23 Mar 2014 01:35:22 +0000 (02:35 +0100)

Trivial merge