Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/moonshot-ui into debian
authorSam Hartman <hartmans@debian.org>
Tue, 29 Oct 2013 14:37:48 +0000 (10:37 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 29 Oct 2013 14:37:48 +0000 (10:37 -0400)
commitb5588d54790f635cda93791559a21de73fc94b0f
tree730118790e69fd61c55c845ad84cb9d3afe1cc71
parentaba063c19fc0a4b9b21d93e44369e23e4c05da84
parenta080b6cf5e60ae41590887d5a01356e00536fb65
Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/moonshot-ui into debian

Conflicts:
moonshot-ui.spec.in
configure.ac