Merge branch 'master' of file:///srv/git/moonshot-ui into debian

Conflicts:
	.gitignore

diff --cc .gitignore
index b25c15b,f15371c..351fc74
mode 100644,100755..100644
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,76 +1,20 @@@
 -stamp-h1\r
 -*.stamp\r
 -*.exe\r
 -*.o\r
 -.deps\r
 -.dirstamp\r
 -po/stamp-po\r
 -po/remove-potcdate.*\r
 -po/moonshot.pot\r
 -po/insert-header.sin\r
 -po/*.header\r
 -po/*.sed\r
 -po/[Rr]ules-quot\r
 -po/POTFILES\r
 -Makefile.in\r
 -Makefile\r
 -po/Makevars.template\r
 -configure\r
 -config.h*\r
 -config.log\r
 -config.status\r
 -build-aux\r
 -autom4te.cache\r
 -aclocal.m4\r
 -ABOUT-NLS\r
 -src/moonshot-add-dialog.c\r
 -src/moonshot-custom-vbox.c\r
 -src/moonshot-id.c\r
 -src/moonshot-idcard-widget.c\r
 -src/moonshot-identity-request.c\r
 -src/moonshot-identities-manager.c\r
 -src/moonshot-msrpc.h\r
 -src/moonshot-msrpc_c.c\r
 -src/moonshot-msrpc_s.c\r
 -src/moonshot-password-dialog.c\r
 -src/moonshot-server.c\r
 -src/moonshot-utils.c\r
 -src/moonshot-window.c\r
 -src/msrpc-client.c\r
 -src/dbus-client\r
 +*~
++stamp-h1
++*.stamp
++*.exe
++*.o
++.deps
++.dirstamp
++config.log
++config.status
++autom4te.cache
++aclocal.m4
++ABOUT-NLS
++src/dbus-client
+ src/dbus-client.c\r
 -src/moonshot\r
 -m4/codeset.m4\r
 -m4/gettext.m4\r
 -m4/glibc2.m4\r
 -m4/glibc21.m4\r
 -m4/iconv.m4\r
 -m4/intdiv0.m4\r
 -m4/intl.m4\r
 -m4/intldir.m4\r
 -m4/intlmacosx.m4\r
 -m4/intmax.m4\r
 -m4/inttypes-pri.m4\r
 -m4/inttypes_h.m4\r
 -m4/lcmessage.m4\r
 -m4/lib-ld.m4\r
 -m4/lib-link.m4\r
 -m4/lib-prefix.m4\r
 -m4/lock.m4\r
 -m4/longlong.m4\r
 -m4/nls.m4\r
 -m4/po.m4\r
 -m4/printf-posix.m4\r
 -m4/progtest.m4\r
 -m4/size_max.m4\r
 -m4/stdint_h.m4\r
 -m4/uintmax_t.m4\r
 -m4/visibility.m4\r
 -m4/wchar_t.m4\r
 -m4/wint_t.m4\r
 -m4/xsize.m4\r
 -moonshot.msi\r
 -moonshot.wixpdb\r
 -po/Makefile.in.in\r
 -app.wixobj\r
 -org.janet.Moonshot.service\r
++src/moonshot
++moonshot.msi
++moonshot.wixpdb
++app.wixobj
++org.janet.Moonshot.service
++