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

diff --git a/LICENSE b/LICENSE
index 01fe880bddd22da67d3b3a645e69dedc40881246..fd3ca3b61e762e0f041d442d8c452b3bd79035d2 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -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