From: Bdale Garbee <bdale@gag.com>
Date: Thu, 19 Dec 2013 09:04:43 +0000 (-0700)
Subject: Merge branch 'branch-1.3' into debian
X-Git-Tag: debian/1.3-1~2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=e572092092f06b7bde762ad24cceea32271bfbd2;p=fw%2Faltos

Merge branch 'branch-1.3' into debian

Conflicts:
	src/test/Makefile
---

e572092092f06b7bde762ad24cceea32271bfbd2