Merge branch 'master' into altosdroid
authorMike Beattie <mike@ethernal.org>
Sun, 10 Mar 2013 06:07:01 +0000 (19:07 +1300)
committerMike Beattie <mike@ethernal.org>
Sun, 10 Mar 2013 06:07:01 +0000 (19:07 +1300)

Trivial merge