]> git.ipfire.org Git - ipfire-2.x.git/commit
Merge branch 'uap' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 Nov 2011 16:10:35 +0000 (17:10 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 Nov 2011 16:10:35 +0000 (17:10 +0100)
commit2c77a816561af92898dd79e01d38f188928ec889
tree59d5f606348f1de320912f86ee89d05c04acaa7b
parent6ee77762b57341c8e6e55fe114b1639495e86d1b
parent8b33e6de6f564ce0c35f9ea6affe76cabf9740ca
Merge branch 'uap' into next