[gpsd-commit-watch] [SCM] GPSD branch, master, updated. release-3.11-324-gb4a2546

[Reinhard Arlt]

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 "GPSD".

The branch, master has been updated
       via  b4a25464ed5b5d87b4c6ee263e6c2b9be559987c (commit)
       via  ddfee004f234e707d5c74ea4e8cda8cccf974d5b (commit)
      from  3232820d87e9f91731a27bdd26b0cab404c109cf (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 b4a25464ed5b5d87b4c6ee263e6c2b9be559987c
Merge: ddfee00 3232820
Author: Reinhard Arlt <address@hidden>
Date:   Sat Jan 31 08:29:37 2015 +0100

    Merge logs.

commit ddfee004f234e707d5c74ea4e8cda8cccf974d5b
Author: Reinhard Arlt <address@hidden>
Date:   Sat Jan 31 08:27:46 2015 +0100

    Change JSON encoding in checkfile.

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

Summary of changes:
 .../logfile_20140914_365495765_can.log.chk         |  246 ++++++++++----------
 1 files changed, 123 insertions(+), 123 deletions(-)


hooks/post-receive
-- 
GPSD