]> git.ipfire.org Git - thirdparty/libnl.git/commitdiff
Merge branch 'master' of git://dev.medozas.de/libnl
authorThomas Graf <tgr@lsx.localdomain>
Wed, 2 Sep 2009 21:41:03 +0000 (23:41 +0200)
committerThomas Graf <tgr@lsx.localdomain>
Wed, 2 Sep 2009 21:41:03 +0000 (23:41 +0200)
Conflicts:
lib/Makefile
src/Makefile


Trivial merge