Merge branch 'master' of git://github.com/friendica/friendica
authorVasudev Kamath <kamathvasudev@gmail.com>
Sun, 12 Feb 2012 09:36:41 +0000 (15:06 +0530)
committerVasudev Kamath <kamathvasudev@gmail.com>
Sun, 12 Feb 2012 09:36:41 +0000 (15:06 +0530)
commit495d0fb80f228e2edf68fb0a52b460851403d379
tree65b7eb9285b706d1187a07dc2f1bb9f1837708ae
parentcbf53beec12bf835177695fef9cd6a33ce9d1629
parent8b101c6cb865c24cefd610e01ad628abd1152217
Merge branch 'master' of git://github.com/friendica/friendica
include/text.php