From: Rob Norris <rw_norris@hotmail.com>
Date: Mon, 19 Dec 2011 22:13:44 +0000 (+0000)
Subject: Merge branch 'ExternalOptions'
X-Git-Url: https://git.street.me.uk/andy/viking.git/commitdiff_plain/c67fc2cb89f78a3eaefbe085468350365b1e77f3?hp=c67fc2cb89f78a3eaefbe085468350365b1e77f3

Merge branch 'ExternalOptions'
---