| commit | 39a4f047c89ceb111c1756596c712a57048154e3 | [log] [tgz] |
|---|---|---|
| author | Harald Welte <laforge@gnumonks.org> | Fri Nov 27 09:19:21 2009 +0100 |
| committer | Harald Welte <laforge@gnumonks.org> | Fri Nov 27 09:19:21 2009 +0100 |
| tree | 9c237408c22b7635903884af2456f9eec5cdcc4a | |
| parent | 260b7ddb239d0d497ee7bb7c8c93d52a1c0fe88c [diff] | |
| parent | 1a79d364401dfad2a71f1e61ff13a3861e3da46e [diff] |
Merge remote branch 'origin/master' into the lcr_rtp branch Conflicts: openbsc/src/Makefile.am