Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

This commit is contained in:
redmatrix 2016-04-11 13:04:17 -07:00
commit 5ab1d509d2