Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Wed, 12 Mar 2014 00:25:39 +0000 (01:25 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Wed, 12 Mar 2014 00:25:39 +0000 (01:25 +0100)
commit5b6ab865efa692b25590f302c111b30680fbacdd
tree7efaddb6a47105700882f409da3c7da711df2490
parentb757191bc6d258887445d88cdfe5b18666295660
parent4b2ecf9112a34baf2b41aeb4dffeaa698bb9f79a
Merge branch 'master' into epoxy

Conflicts:
Makefile.in
Makefile.in
configure.ac