]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Mon, 5 Aug 2013 18:32:02 +0000 (20:32 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 5 Aug 2013 18:32:02 +0000 (20:32 +0200)
1  2 
include/onepoll.php

Simple merge