Merge remote branch 'origin/sylvain/pending'
authorHarald Welte <laforge@gnumonks.org>
Wed, 28 Apr 2010 09:43:50 +0000 (11:43 +0200)
committerHarald Welte <laforge@gnumonks.org>
Wed, 28 Apr 2010 09:43:50 +0000 (11:43 +0200)
commitc8d0ef7b58cb8a370ed557a5fb6d2628d0b94ccf
treec2714ca99e898ac152a1d2ea002f9b3545372cee
parentc3ce8f62f67f493bb94e4552ac95b6dca9dd51f7
parentc809be2ac2d4b554421cf27a2635126a9ebef8bf
Merge remote branch 'origin/sylvain/pending'