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

2011-01-01 13:00:50 +01:00 · 2011-01-01 13:00:50 +01:00 · e024360d44
commit e024360d44
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 * Friendika
-* Copyright (c) 2010, Mike Macgirvin
+* Copyright (c) 2010, 2011 Mike Macgirvin
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without