Merge branch 'maint'

* maint:
  Fix list of released versions in the toc document
  Do not fail "describe --always" in a tag-less repository
diff --git a/builtin-describe.c b/builtin-describe.c
index 2dcfd3d..eaa8a9d 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -351,7 +351,7 @@
 	}
 
 	for_each_ref(get_name, NULL);
-	if (!found_names)
+	if (!found_names && !always)
 		die("No names found, cannot describe anything.");
 
 	if (argc == 0) {