[Olsr-commit] OLSR.org main repository branch, master, updated. v0.6.7-34-g3f73a74

[(spam-protected)]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OLSR.org main repository".

        See http://olsr.org/git/?p=olsrd.git;a=commitdiff;h=v0.6.7-34-g3f73a74
        for a web version of the last commit.

The branch, master has been updated
       via  3f73a740cf7f8e46a48695018dec1c3c9cc2f50e (commit)
       via  e64d457136e5a2acc00e5286e2aeb2339235b0a5 (commit)
       via  98ff07f53453b0093fb43fec365aab8109c670c7 (commit)
       via  f5ce3dca47ed2ce890f0f03632b9d37897f3c7b4 (commit)
      from  34a0e4a162d685ad0eff85127f3161dd02bc08c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3f73a740cf7f8e46a48695018dec1c3c9cc2f50e
Merge: 34a0e4a e64d457
Author: Ferry Huberts <(spam-protected)>
Date:   Fri Oct 24 09:56:58 2014 +0200

    Merge branch 'release-0.6.7'
    
    * release-0.6.7:
      jsoninfo: fix indentation
      txtinfo: ensure null termination of string buffer
      txtinfo: duplicate code in branch

-----------------------------------------------------------------------

Summary of changes:
 lib/jsoninfo/src/olsrd_jsoninfo.c |    4 ++--
 lib/txtinfo/src/olsrd_txtinfo.c   |   14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
OLSR.org main repository