Merged #80 "Replace Dagger with Guice"

author James Moger <james.moger@gitblit.com>

Thu, 3 Jul 2014 22:07:16 +0000 (16:07 -0600)

committer James Moger <james.moger@gitblit.com>

Thu, 3 Jul 2014 22:07:16 +0000 (16:07 -0600)
author James Moger <james.moger@gitblit.com>
Thu, 3 Jul 2014 22:07:16 +0000 (16:07 -0600)
committer James Moger <james.moger@gitblit.com>
Thu, 3 Jul 2014 22:07:16 +0000 (16:07 -0600)
diff --cc build.moxie
Simple merge
diff --cc build.xml
Simple merge
author	James Moger <james.moger@gitblit.com>
	Thu, 3 Jul 2014 22:07:16 +0000 (16:07 -0600)
committer	James Moger <james.moger@gitblit.com>
	Thu, 3 Jul 2014 22:07:16 +0000 (16:07 -0600)
		1	2
build.moxie	patch \|	diff1 \|	diff2 \|	blob \| history
build.xml	patch \|	diff1 \|	diff2 \|	blob \| history