Merge branch 'master' into 2.3.0

Conflicts:
	AUTHORS
	CMakeLists.txt
	INSTALL
	NEWS
	cmake.h.in
	doc/man/task-faq.5.in
	package-config/osx/README
	scripts/utils/verify_l10n
	src/API.h
	src/Config.cpp
	src/Context.cpp
	src/DOM.cpp
	src/Hooks.cpp
	src/TransportShell.h
	src/commands/CmdDiagnostics.cpp
	src/commands/CmdShell.cpp
	src/commands/CmdVersion.cpp
	src/en-US.h
	src/shell/Readline.h
	src/wcwidth6.cpp
	test/CMakeLists.txt
	test/color.uda.t
	test/duration.t.cpp
	test/hook.on-launch.t
	test/template.t
	test/uuid.t

src/commands/CmdDiagnostics.cpp

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -129,27 +129,6 @@ int CmdDiagnostics::execute (std::string& output)
       << " +vp" << sizeof (void*)
       << "\n\n";
 
-  out << bold.colorize (STRING_CMD_DIAG_LIBRARIES)
-      << "\n";
-
-  out << "    libuuid: "
-#if defined (HAVE_UUID) and defined (HAVE_UUID_UNPARSE_LOWER)
-      << "libuuid + uuid_unparse_lower"
-#elif defined (HAVE_UUID) and !defined (HAVE_UUID_UNPARSE_LOWER)
-      << "libuuid, no uuid_unparse_lower"
-#else
-      << "n/a"
-#endif
-      << "\n";
-
-  out << "  libgnutls: "
-#ifdef HAVE_LIBGNUTLS
-      << GNUTLS_VERSION
-#else
-      << "n/a"
-#endif
-      << "\n\n";
-
   out << bold.colorize (STRING_CMD_DIAG_FEATURES)
       << "\n"
 
@@ -186,6 +165,24 @@ int CmdDiagnostics::execute (std::string& output)
       << " +tls"
 #else
       << " -tls"
+#endif
+      << "\n";
+
+  out << "    libuuid: "
+#if defined (HAVE_UUID) and defined (HAVE_UUID_UNPARSE_LOWER)
+      << "libuuid + uuid_unparse_lower"
+#elif defined (HAVE_UUID) and !defined (HAVE_UUID_UNPARSE_LOWER)
+      << "libuuid, no uuid_unparse_lower"
+#else
+      << "n/a"
+#endif
+      << "\n";
+
+  out << "  libgnutls: "
+#ifdef HAVE_LIBGNUTLS
+      << GNUTLS_VERSION
+#else
+      << "n/a"
 #endif
       << "\n\n";