]> git.tue.mpg.de Git - adu.git/commit
Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
commitd0f564069d8445e5ffe03c57ff63721f4c47877e
treea1252b8328f0f167873feaf670fff43489793f35
parentc7d5ddb6906ab8a18181fee29ac78d604db5fdb9
parent296cf54c41e837568ac77570d58a133c41db0b63
Merge commit 'fml/master'

Conflicts:
adu.ggo
user.c
interactive.c
user.c