[Olsr-commit] OLSR.org main repository branch, master, updated. v0.9.0-9-g043ee47

[(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.9.0-9-g043ee47
        for a web version of the last commit.

The branch, master has been updated
       via  043ee47f5a6213f30fb0eddf8c8f316e13303530 (commit)
       via  284f5d98be820924559fd0920734601ad21bae7b (commit)
       via  3a7d5ae8492bc7b1a209d530517e6957f94ff95e (commit)
      from  d44c7ee33cef2f73eac00956f3b275a48f75b2d0 (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 043ee47f5a6213f30fb0eddf8c8f316e13303530
Merge: d44c7ee 284f5d9
Author: Ferry Huberts <(spam-protected)>
Date:   Thu Jun 18 09:56:54 2015 +0200

    Merge branch 'release-0.9.0'
    
    * release-0.9.0:
      txtinfo: jsoninfo: do not output smart-gateway info when not enabled.
      jsoninfo: do not output smart-gateway info when not enabled.

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

Summary of changes:
 lib/jsoninfo/src/olsrd_jsoninfo.c |  105 ++++++++++++++++++-----------------
 lib/txtinfo/src/olsrd_txtinfo.c   |  109 +++++++++++++++++++------------------
 2 files changed, 107 insertions(+), 107 deletions(-)


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