projects / gnulib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08f5887 0c4be75)
Merge branch 'upstream' into stable
authorIan Beckwith <ianb@erislabs.net>
Wed, 18 May 2011 22:12:22 +0000 (23:12 +0100)
committerIan Beckwith <ianb@erislabs.net>
Wed, 18 May 2011 22:12:22 +0000 (23:12 +0100)
Conflicts:
ChangeLog
build-aux/depcomp
build-aux/texinfo.tex
m4/getaddrinfo.m4
top/maint.mk


Trivial merge
gnulib debian + stable branches