Merge remote branch 'origin/master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 11 May 2013 05:21:46 +0000 (07:21 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 11 May 2013 05:21:46 +0000 (07:21 +0200)

Trivial merge