[SCM] phasex/master: Merge tag 'upstream/0.14.97'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.14.97
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 202cd4857296bd1d3d3c18c233d36bd56f340475
X-Git-Newrev: 2b4637d29aea8f8ed4b688bb79ef49833326bf33

The following commit has been merged in the master branch:
commit 77ffbb48133fc17cd61b20935e12ff2e55140063
Merge: 202cd4857296bd1d3d3c18c233d36bd56f340475 2eccb44618d25de574158bc69f6c7b237207bbb0
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jan 12 19:43:12 2013 +0000

    Merge tag 'upstream/0.14.97'
    
    Upstream version 0.14.97

diff --combined .gitignore
index 845ca06,8c74dcf..7937227
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,32 +1,33 @@@
 +.pc
+ *~
+ \#*
+ .#*
+ */#*
+ */.#*
+ */*~
+ .*.swp
+ */.*.swp
+ */*.o
+ *.orig
+ */*.orig
+ */*/*.orig
+ *.rej
+ */*.rej
+ */*/*.rej
+ */Makefile
+ */Makefile.in
+ Makefile
+ Makefile.in
+ aclocal.m4
+ autom4te.cache
+ config.h
+ config.log
+ config.status
+ configure
+ phasex.spec
+ phasex-*.tar.gz
+ phasex-*.rpm
+ stamp-h1
+ misc/phasex.desktop
+ src/.deps/
+ src/phasex

-- 
phasex packaging