Merge commit 'v1.2.1.22' into stripped

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/CMakeLists.txt
	src/Makefile.am
	src/guichan/gui.cpp

1 files changed, 5 insertions, 0 deletions

diff --git a/manaplustest b/manaplustest
new file mode 100755
index 000000000..12bdc2b8a
--- /dev/null
+++ b/manaplustest
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd $(dirname $(whereis -b manaplus|cut -d " " -f 2))
+
+manaplus --tests