]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Fri, 27 Mar 2015 15:37:12 +0000 (16:37 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 27 Mar 2015 15:37:12 +0000 (16:37 +0100)
commitc9dbff374187f8e7f5759528eb852355853868f0
treebb856da7dc1adef630bf5f5dda17938c1862e6a6
parent0d5443e93ea852eff506e69267540ab42c915199
parentf92fe73d038f6b1c393b1fea41d8e7ca31f0f1ec
Merge branch 'master' of gitorious.org:social/mainline into nightly

Conflicts:
INSTALL

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