Merge branch 'stratum_agpl'
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 25 Mar 2014 02:04:43 +0000 (02:04 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 25 Mar 2014 02:04:43 +0000 (02:04 +0000)
commit0fefe1e90a13b21a3f1ba9482aa4cf9aa9de981b
tree4ec59bd34f55de4cc7d5e052e9039f103362c917
parent65080bbe92c20021397f0c0f5bac8b6e4a9c3182
parentd7172ca3874a5858da00a0d1aa2af48d02cb0d0c
Merge branch 'stratum_agpl'