[SCM] ffado/master: Merge tag 'upstream/2.1.0+svn2456'

[adiknoth-guest at users.alioth.debian.org]

Imported Upstream version 2.1.0+svn2456
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8b752f94e0fe19321d9547954eb77db38e0ca1e9
X-Git-Newrev: 2db5450a6c89f6d2a5715ecce7d918cb20ae6c2d

The following commit has been merged in the master branch:
commit 7f73ab1cfdc4bd964b36909f19fd6a5bbad33795
Merge: 0909e1934efc1d20357ed29a3c0c8970745bbe16 9e3805a7872745484b84c4b3b7072570371b7c41
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri Nov 1 23:47:35 2013 +0100

    Merge tag 'upstream/2.1.0+svn2456'
    
    Upstream version 2.1.0+svn2456
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index b408e6c,9bab584..597281b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,10 +1,11 @@@
 +/.pc
+ cache/
+ .sconsign.dblite
+ config.h
+ config_debug.h
+ libffado.pc
+ version.h
+ *.pyc
+ *.o
+ *.os
+ *.so

-- 
Free Firewire Audio Drivers (ffado.org) packaging