]> git.street.me.uk Git - andy/viking.git/commitdiff
Merge branch 'MapsExtendedConfiguration'
authorRob Norris <rw_norris@hotmail.com>
Tue, 23 Sep 2014 23:55:14 +0000 (00:55 +0100)
committerRob Norris <rw_norris@hotmail.com>
Tue, 23 Sep 2014 23:55:14 +0000 (00:55 +0100)

Trivial merge