Merge branch 'omprog' into spaceship spaceship
authorRainer Gerhards <rgerhards@adiscon.com>
Wed, 1 Apr 2009 14:39:44 +0000 (16:39 +0200)
committerRainer Gerhards <rgerhards@adiscon.com>
Wed, 1 Apr 2009 14:39:44 +0000 (16:39 +0200)
Conflicts:
plugins/omdtn/Makefile.am
plugins/omdtn/omdtn.c


Trivial merge