Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/moonshot-ui into debian
authorSam Hartman <hartmans@debian.org>
Tue, 29 Oct 2013 21:56:58 +0000 (17:56 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 29 Oct 2013 21:56:58 +0000 (17:56 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge