Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/moonshot-ui into debian

Conflicts:
	moonshot-ui.spec.in

diff --combined configure.ac
index 6425db2,51863c9..75bed47
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -19,6 -19,7 +19,7 @@@ AM_MAINTAINER_MODE([enable]
  
  LT_PREREQ([2.2])
  LT_INIT([win32-dll])
+ AC_CHECK_FUNCS_ONCE(geteuid)
  
  # Checks for programs.
  PKG_PROG_PKG_CONFIG([0.23])
@@@ -225,7 -226,7 +226,7 @@@ PKG_CHECK_MODULES(libmoonshot,
  
  # i18n stuff
  AM_GNU_GETTEXT([external])
 -AM_GNU_GETTEXT_VERSION([0.17])
 +AM_GNU_GETTEXT_VERSION([0.18.1])
  
  AC_SUBST([GETTEXT_PACKAGE],[PACKAGE_TARNAME])
  AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME],[Define to the gettext package name.])