Merge branch 'next'

Conflicts:
	src/manage.c
	src/util.c
	src/xinerama.c

diff --cc src/config.c
index 2c2ba0453e9b0a7683936a661bcbca5f9935dde7,a5f635dc5920eaf4c6a07591078cd5d39e5e9c6d..bc7edeab408080bc34b6683f229d98cef75a3b75
--- 1/src/config.c
--- 2/src/config.c
+++ b/src/config.c
@@@ -242,27 -401,26 +401,30 @@@ void load_configuration(xcb_connection_
                  /* assign window class[/window title] → workspace */
                  if (strcasecmp(key, "assign") == 0) {
                          LOG("assign: \"%s\"\n", value);
-                         char *class_title = sstrdup(value);
+                         char *class_title;
                          char *target;
+                         char *end;
  
                          /* If the window class/title is quoted we skip quotes */
-                         if (class_title[0] == '"') {
-                                 class_title++;
-                                 char *end = strchr(class_title, '"');
-                                 if (end == NULL)
-                                         die("Malformed assignment, couldn't find terminating quote\n");
-                                 *end = '\0';
+                         if (value[0] == '"') {
+                                 class_title = sstrdup(value+1);
+                                 end = strchr(class_title, '"');
                          } else {
+                                 class_title = sstrdup(value);
                                  /* If it is not quoted, we terminate it at the first space */
-                                 char *end = strchr(class_title, ' ');
-                                 if (end == NULL)
-                                         die("Malformed assignment, couldn't find terminating space\n");
-                                 *end = '\0';
+                                 end = strchr(class_title, ' ');
                          }
+                         if (end == NULL)
+                                 die("Malformed assignment, couldn't find terminating quote\n");
+                         *end = '\0';
+ 
+                         /* Strip trailing whitespace */
+                         while (strlen(value) > 0 && value[strlen(value)-1] == ' ')
+                                 value[strlen(value)-1] = '\0';
 +
 +                        /* Strip trailing whitespace */
 +                        while (strlen(value) > 0 && value[strlen(value)-1] == ' ')
 +                                value[strlen(value)-1] = '\0';
  
                          /* The target is the last argument separated by a space */
                          if ((target = strrchr(value, ' ')) == NULL)

diff --cc website/downloads/index.html
index 9cbea01c5345b14e92761e3fae53e19716049711,5e1f2045b3980e5aae440638b83b6193ae1cd679..360413a7f206105724856b9108b68b079dd87149
--- 1/website/downloads/index.html
--- 2/website/downloads/index.html
+++ b/website/downloads/index.html
@@@ -83,7 -64,7 +83,7 @@@ a 
  
  <ul>
    <li>
--    <a href="http://packages.debian.org/sid/i3">Debian GNU/Linux</a> (in unstable currently)
++    <a href="http://packages.debian.org/sid/i3">Debian GNU/Linux</a>
    </li>
    <li>
      <a href="http://aur.archlinux.org/packages.php?ID=24720">Arch Linux</a>
@@@ -108,11 -89,11 +108,17 @@@
  <h2>Downloads</h2>
  
  <p>
--  The current stable version is 3.β (transcribed 3.b because many systems still can’t
++  The current stable version is 3.γ (transcribed 3.c because many systems still can’t
    handle UTF-8 in version numbers).
  </p>
  
  <ul>
++  <li>
++    <a href="/downloads/i3-3.c.tar.bz2">i3-3.c.tar.bz2</a>
++    (<a href="/downloads/i3-3.c.tar.bz2.asc">GPG signature</a>), Version 3.γ, 107 KiB, 2009-08-19,
++    <a href="/downloads/RELEASE-NOTES-3.c.txt">release notes</a>
++
++  </li>
    <li>
      <a href="/downloads/i3-3.b.tar.bz2">i3-3.b.tar.bz2</a>
      (<a href="/downloads/i3-3.b.tar.bz2.asc">GPG signature</a>), Version 3.β, 96 KiB, 2009-06-26,