[Olsr-commit] OLSR.org main repository branch, master, updated. v0.6.6.1-102-g5bfc121

[(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.6.1-102-g5bfc121
        for a web version of the last commit.

The branch, master has been updated
       via  5bfc121512d4393a9595bfb7574172a69836f43b (commit)
       via  9f3bbd8822e21a77dc518725703005c020627eb9 (commit)
       via  d960686da2a7f5899d8848475c37789128e22345 (commit)
       via  698ba0f3764331122bd9b63e71fc135439dc40d7 (commit)
      from  eba9b7c8e573313628552d8a4fc9308d1274a6a5 (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 5bfc121512d4393a9595bfb7574172a69836f43b
Merge: eba9b7c 9f3bbd8
Author: Ferry Huberts <(spam-protected)>
Date:   Mon Oct 21 18:12:25 2013 +0200

    Merge branch 'release-0.6.6'
    
    * release-0.6.6:
      Update version after release of v0.6.6.1
      Release v0.6.6.1
      Fix jsoninfo again after a regression which was introduced with http://olsr.org/git/?p=olsrd.git;a=commit;h=8f633c9f54e179ce530291571a13b3b96d288bf4 For a discussion of the bug see http://olsr.org/bugs/view.php?id=40  Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
    
    Conflicts:
    	Makefile
    	gui/win32/Inst/installer.nsi
    	gui/win32/Main/Frontend.rc

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

Summary of changes:
 CHANGELOG |    9 +++++++++
 1 file changed, 9 insertions(+)


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