Merge branch 'master' of git://github.com/friendika/friendika

This commit is contained in:
root 2011-01-01 13:00:50 +01:00
commit e024360d44

View file

@ -1,5 +1,5 @@
* Friendika * Friendika
* Copyright (c) 2010, Mike Macgirvin * Copyright (c) 2010, 2011 Mike Macgirvin
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without