Merge branch 'maint'

Conflicts:
	lib/libalpm/sync.c

1 files changed, 12 insertions, 5 deletions

diff --git a/doc/index.txt b/doc/index.txt
index b221d237..9e94dbb7 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -96,12 +96,19 @@ Releases
 !3.1.3 !2008-03-06
 !3.1.2 !2008-02-20
 !3.1.1 !2008-01-20
-!3.1.0 !2008-01-09
 !======
 |
 [frame="topbot",grid="none",options="header,autowidth"]
 !======
 !Version !Date
+!3.1.0 !2008-01-09
+!3.0.6 !2007-09-16
+!3.0.5 !2007-06-17
+!3.0.4 !2007-05-08
+!3.0.3 !2007-04-28
+!3.0.2 !2007-04-23
+!3.0.1 !2007-04-04
+!3.0.0 !2007-03-25
 !2.9.8 !2006-02-02
 !2.9.7 !2005-09-16
 !2.9.7-TEST3 !2005-09-11
@@ -122,15 +129,15 @@ Releases
 !2.7.9 !2004-04-30
 !2.7.8 !2004-04-29
 !2.7.7 !2004-04-15
-!2.7.6 !2004-04-04
-!2.7.5 !2004-03-02
-!2.7.4 !2004-02-18
-!2.7.3 !2004-02-07
 !======
 |
 [frame="topbot",grid="none",options="header,autowidth"]
 !======
 !Version !Date
+!2.7.6 !2004-04-04
+!2.7.5 !2004-03-02
+!2.7.4 !2004-02-18
+!2.7.3 !2004-02-07
 !2.7.2 !2004-01-04
 !2.7.1 !2003-12-21
 !2.7 !2003-11-25