Update ui to fix merge conflict
authorSam Hartman <hartmans@debian.org>
Mon, 23 Jun 2014 16:08:58 +0000 (12:08 -0400)
committerSam Hartman <hartmans@debian.org>
Mon, 23 Jun 2014 16:10:03 +0000 (12:10 -0400)
commitcf46e77f28faa0489cfbf90acaf2dc3980d0447d
tree8b6b006de3f2ebcbc8f19cd42b7884f7bce59694
parentec6818f517197e2af11bf730a9fba8f664856efb
Update ui to fix merge conflict
ui