Merge branch 'branch-1.3' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 19 Dec 2013 09:04:43 +0000 (02:04 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 19 Dec 2013 09:04:43 +0000 (02:04 -0700)
commite572092092f06b7bde762ad24cceea32271bfbd2
treef2523fca6f7c974357f16d114beb3098d9e93c1b
parentcf05119040c45bfd1a0f63fcaae5dcf7a2556639
parent27528961457865acc3a38b822268df6d7cb86cfd
Merge branch 'branch-1.3' into debian

Conflicts:
src/test/Makefile