From: Bdale Garbee <bdale@gag.com>
Date: Wed, 10 Sep 2014 05:28:39 +0000 (-0600)
Subject: Merge branch 'branch-1.5' into debian
X-Git-Tag: debian/1.5-1~12
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=16405fd3eb6f82ef3a709e3ed30fc48faef7b547

Merge branch 'branch-1.5' into debian

Conflicts:
	ChangeLog
	Releasing
	altosui/Instdrv/NSIS/Includes/java.nsh
	altosui/altos-windows.nsi.in
	configure.ac
	doc/Makefile
	doc/altusmetrum.xsl
	micropeak/micropeak-windows.nsi.in
	telegps/telegps-windows.nsi.in
---

16405fd3eb6f82ef3a709e3ed30fc48faef7b547