Merge branch 'master' into next

[i3/i3] / libi3 / ucs2_conversion.c

diff --git a/libi3/ucs2_conversion.c b/libi3/ucs2_conversion.c
index 9a8c478f0c7213d3f1c19ba4c370623e5015e389..3a7d0194d45f5430ea4d783a897126f8e5f6f0eb 100644 (file)
--- a/libi3/ucs2_conversion.c
+++ b/libi3/ucs2_conversion.c
@@ -2,7 +2,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
 #include <err.h>