]> git.mxchange.org Git - friendica.git/commit
Merge https://github.com/fabrixxm/friendica into pull
authorfriendica <info@friendica.com>
Wed, 13 Jun 2012 23:25:09 +0000 (16:25 -0700)
committerfriendica <info@friendica.com>
Wed, 13 Jun 2012 23:25:09 +0000 (16:25 -0700)
commit85876be48a8376bf22201a4561ed1642197c6fa3
tree679df5fa4047c537a8061af602a4487a730d0607
parentd908c9dd7196276e1364f77abb053aba3dce77af
parentfeab17bfea374fd753b18157eeb8bf5cd61954cf
Merge https://github.com/fabrixxm/friendica into pull

Conflicts:
util/messages.po
util/messages.po