Merge remote-tracking branch 'kinlo/authentication2'
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 9 May 2013 21:58:51 +0000 (21:58 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 9 May 2013 21:58:51 +0000 (21:58 +0000)
commitec6f70242aa719370ccc471237b74144b9ebd209
treefc0c3663188ececa5000bcb6fcbd3b1a8d3ee968
parent00bc280592e351eeb7e6e5abb20cfd8021d3c1e6
parente328ef981f35ecf0d8cb7bbe40d74814fcc3b74c
Merge remote-tracking branch 'kinlo/authentication2'