[FYI] Merged maint into branch-1.11

2012-01-15 Thread Stefano Lattarini
commit ca2f878ef53c25f2d49df9db7e599f9e681117fb Merge: 3950866 05c0298 Author: Stefano Lattarini AuthorDate: Sun Jan 15 17:21:39 2012 +0100 Commit: Stefano Lattarini CommitDate: Sun Jan 15 17:21:39 2012 +0100 Merge branch 'maint' into branch-1.11 * maint: gnupload: moved t

[FYI] merged maint into branch-1.11

2011-12-04 Thread Stefano Lattarini
commit ca29afc5aed617f61e11b155b21034690329ac67 Merge: dac3254 ca0ba5d Author: Stefano Lattarini AuthorDate: Sun Dec 4 13:24:57 2011 +0100 Commit: Stefano Lattarini CommitDate: Sun Dec 4 13:24:57 2011 +0100 Merge branch 'maint' into branch-1.11 * maint: tests: fix spur