Merge branch 'master' of git://gitorious.org/laconica/mainline master
authorAntti Salminen <antti.salminen@gmail.com>
Tue, 17 Feb 2009 12:50:59 +0000 (14:50 +0200)
committerAntti Salminen <antti.salminen@gmail.com>
Tue, 17 Feb 2009 12:50:59 +0000 (14:50 +0200)
commit055ad0f803e1bb668e1182adcd333143a4539cff
treeb1825f0e3f7fc063b69c39fa314e11325dc5cc7c
parent377db4a4ea74c2a74e972b0215d54dc37064c753
parented964ea980be63999860aaa5f39274768eca5d59
Merge branch 'master' of git://gitorious.org/laconica/mainline
config.php.sample