From: Mikael Nordfeldth <mmn@hethane.se>
Date: Sun, 5 Apr 2015 13:35:54 +0000 (+0200)
Subject: Merge branch 'nightly'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c94d9994d898eddf654121ac45d455891954e830;p=quix0rs-gnu-social.git

Merge branch 'nightly'

Conflicts:
	INSTALL
---

c94d9994d898eddf654121ac45d455891954e830