Merge branch 'master' of git.osmocom.org:libosmocore
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 23 May 2011 17:01:34 +0000 (19:01 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 23 May 2011 17:01:34 +0000 (19:01 +0200)
commit3056d012d3d5da853535488619f12beeea59a6a4
tree4b5a511154e0241b9ca4724534995d443d9baac3
parentdd93bf46ed0c3c75c1e330db2197703c0b6f8cda
parentf7a1bcce0cea50650517e305d59e674475f913d0
Merge branch 'master' of git.osmocom.org:libosmocore