]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 15 Jul 2012 15:26:00 +0000 (17:26 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 15 Jul 2012 15:26:00 +0000 (17:26 +0200)
1  2 
include/items.php
include/text.php

Simple merge
Simple merge