]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'geonamesxml' into 0.9.x
authorEvan Prodromou <evan@status.net>
Wed, 23 Dec 2009 23:53:58 +0000 (15:53 -0800)
committerEvan Prodromou <evan@status.net>
Wed, 23 Dec 2009 23:53:58 +0000 (15:53 -0800)
1  2 
plugins/GeonamesPlugin.php

Simple merge