Merge branch 'master' of http://olsr.org/git/framework
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 24 May 2012 08:18:16 +0000 (10:18 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 24 May 2012 08:18:16 +0000 (10:18 +0200)
1  2 
src-api/common/string.c
src-api/common/string.h

Simple merge
Simple merge