[packages/ixion: 2/2] Merge branch 'master' of git://git.pld-linux.org/packages/ixion

[qboosh]

commit 31b608acd6ddbac690e9f8a17fc51e72d1061c88
Merge: 940f72a b2e94c4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Feb 4 21:24:08 2014 +0100

    Merge branch 'master' of git://git.pld-linux.org/packages/ixion
    
    Conflicts:
    	ixion.spec

---
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ixion.git/commitdiff/31b608acd6ddbac690e9f8a17fc51e72d1061c88