Merge remote branch 'origin/prom/pending'
authorHarald Welte <laforge@gnumonks.org>
Sat, 24 Apr 2010 11:27:00 +0000 (13:27 +0200)
committerHarald Welte <laforge@gnumonks.org>
Sat, 24 Apr 2010 11:27:00 +0000 (13:27 +0200)
commitf16be90ca304e595d0c2d8536dfcf04e0a96f74f
treebf3c830f7a775e7ca9fbf8cad56e155f3fe5e90b
parente9c6a41c3829a70d61cff08d15c157674a747744
parent955a61ef74e481c7be9f9fbb2a1f85a303fe5406
Merge remote branch 'origin/prom/pending'