Merge branch 'development' into upstream

Signed-off-by: Manoj Srivastava <srivasta@debian.org>

# Conflicts:
#	src/.gitignore
#	src/maid-x11.c
#	src/quest.pkg

1 files changed, 6 insertions, 0 deletions

diff --git a/vendor/bandit/specs/main.cpp b/vendor/bandit/specs/main.cpp
new file mode 100644
index 00000000..dde5de2d
--- /dev/null
+++ b/vendor/bandit/specs/main.cpp
@@ -0,0 +1,6 @@
+#include <specs/specs.h>
+
+int main(int argc, char* argv[])
+{
+  return bandit::run(argc, argv);
+}