Merge tag '1.4' into fox
authorKeith Packard <keithp@keithp.com>
Wed, 16 Jul 2014 05:55:20 +0000 (22:55 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 16 Jul 2014 05:55:20 +0000 (22:55 -0700)
commit3cf030fffffd223c3717011e03aac82346295d71
treeb6da4fbb1180b75bedb86ce608503a6c0aeb47f3
parent607fbb01710be1cb263625337f5be3d0fb48d5e7
parent9ab3a1de95b705783c31a7e16447f52c10b6b480
Merge tag '1.4' into fox

tagging 1.4 release

Conflicts:
src/Makefile
src/Makefile