Merge remote branch 'origin/sylvain/pending'
authorHarald Welte <laforge@gnumonks.org>
Thu, 29 Jul 2010 09:10:09 +0000 (11:10 +0200)
committerHarald Welte <laforge@gnumonks.org>
Thu, 29 Jul 2010 09:10:09 +0000 (11:10 +0200)
commitdf3c7a9c99ff4f965f7a830febc0c43d95e66289
treec4e136be798410b9feb3a41fd11c6f1bf85bc14c
parentd42f73a1ffb4e5db97484d0e732423d2ece22242
parent0cbd5d0139123913d392d149f49807e68261c704
Merge remote branch 'origin/sylvain/pending'