From: Roland Haeder <roland@mxchange.org>
Date: Tue, 10 Mar 2015 02:21:23 +0000 (+0100)
Subject: Merge branch 'master' into social-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=035aae2745e25d44ab9fe1b7bdffbcaa505ba970;p=quix0rs-gnu-social.git

Merge branch 'master' into social-master

The conflict was difference at default value (null versus better array() ).

Conflicts:
	lib/docfile.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

035aae2745e25d44ab9fe1b7bdffbcaa505ba970