]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Mon, 14 May 2012 11:59:37 +0000 (13:59 +0200)
committerzottel <github@zottel.net>
Mon, 14 May 2012 11:59:37 +0000 (13:59 +0200)
commit584b15aaecbf6f58cda2031908f0319c6dfc0700
tree0b56a9e4de6c38a052878f2a5c18a05dae15c57c
parentc43a03e21bcd12b24be8a59741ec6591c1f651d7
parent59aefd9346fbd0d5c3cd9cdbf2158719221412f9
Merge remote branch 'upstream/master'