[cpl-plugin-fors] 01/02: Merge branch 'upstream' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-fors.

commit f17e8314a4a8689199dddddb70fdd8cbfe2c6989
Merge: 963e3c6 0a6074b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Feb 10 16:32:03 2014 +0100

    Merge branch 'upstream' into debian

 calib/gasgano/config/FORS1.prefs |  2 +-
 calib/gasgano/config/FORS2.prefs |  2 +-
 configure                        | 20 ++++++++++----------
 configure.ac                     |  2 +-
 reflex/ForsSpec.xml.in           |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-fors.git