[Jabref-commits] [git] JabRef branch master updated. v_2.9.2-257-gf27be58

[Oliver K. <ol...@us...>]

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

The branch, master has been updated
       via  f27be584fc8e6a138429c2baf76ba8a6bcbb16af (commit)
       via  875ccdfeda0ca42610138babe8174795e162752f (commit)
       via  c6b1d1b1e5e1a80fb1a06f70847bb46578f2f59b (commit)
      from  7d767a2fe10fec3fec5cea40dbf324bf4641530a (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 f27be584fc8e6a138429c2baf76ba8a6bcbb16af
Merge: 7d767a2 875ccdf
Author: Oliver Kopp <ol...@us...>
Date:   Tue Mar 11 16:17:44 2014 +0100

    Merge branch 'beta_2.10'
    
    Conflicts:
    	htdocs/revisionhistory.php
    	jabref/build.xml
    	jabref/src/txt/CHANGELOG
    	jabref/src/txt/README

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

Summary of changes:
 htdocs/revisionhistory.php                         |    8 ++++----
 jabref/build.xml                                   |    4 ++--
 .../sf/jabref/imports/GoogleScholarFetcher.java    |    2 +-
 jabref/src/txt/CHANGELOG                           |    3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
JabRef