Merge branch 'master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 11 May 2013 07:39:08 +0000 (09:39 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 11 May 2013 07:39:08 +0000 (09:39 +0200)

Trivial merge