From: Dan Breslau <dbreslau@painless-security.com>
Date: Fri, 28 Oct 2016 16:33:57 +0000 (-0400)
Subject: Merge branch 'master' (v0.9.6.2) into debian
X-Git-Tag: debiam/ms-ui-1.0.0-1~4
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot-ui.git;a=commitdiff_plain;h=86decf1309157e01659d0a608daa9f2b27c83339

Merge branch 'master' (v0.9.6.2) into debian

Conflicts:
	.gitignore
	Makefile.am
	configure.ac
	libmoonshot/libmoonshot.def
---

86decf1309157e01659d0a608daa9f2b27c83339