Merge branch 'master' into debian

Conflicts:
	.gitignore

diff --cc .gitignore
index bc85dba,58f849f..881476e
mode 100644,100755..100644
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -29,11 -88,12 +29,10 @@@ org.janet.Moonshot.servic
  share/
  moonshot.desktop
  moonshot-webp.desktop
--libmoonshot/moonshot-msrpc.h
--libmoonshot/moonshot-msrpc_c.c
--libmoonshot/moonshot-msrpc_s.c
  libmoonshot/libmoonshot.exp
  libmoonshot/libmoonshot.lib
+ *.tar.gz
+ 
  *.tar.bz2
  *.stackdump
 +

diff --cc configure.ac
Simple merge