Merge branch 'ui-refactor' into infoview

This commit is contained in:
Brad Davis 2015-04-26 20:11:54 -07:00
commit 4740674da2
2 changed files with 5 additions and 5 deletions