commit 31b608acd6ddbac690e9f8a17fc51e72d1061c88
Merge: 940f72a b2e94c4
Author: Jakub Bogusz <[email protected]>
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
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
