]> git.street.me.uk Git - andy/viking.git/commitdiff
Merge branch 'GPX-Route+Icons+Colour'
authorRob Norris <rw_norris@hotmail.com>
Sat, 5 Jan 2013 13:13:20 +0000 (13:13 +0000)
committerRob Norris <rw_norris@hotmail.com>
Sat, 5 Jan 2013 13:13:20 +0000 (13:13 +0000)

Trivial merge