Merge branch 'osx-app'
authorMartin Willi <martin@revosec.ch>
Thu, 18 Dec 2014 08:50:50 +0000 (09:50 +0100)
committerMartin Willi <martin@revosec.ch>
Thu, 18 Dec 2014 08:50:50 +0000 (09:50 +0100)
Mainline the OS X App providing the graphical user interface for the charon-xpc
privileged helper.


Trivial merge