Merge remote-tracking branch 'mjesec/master'
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 18 Jan 2014 19:56:08 +0000 (20:56 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 18 Jan 2014 19:56:08 +0000 (20:56 +0100)
commita12dd669d5a073a8e3fc23b25412a81c60a8baf8
treefa8933d1a27294f10f9f429bee7bf6faf9b185bc
parent5f5de66d1049ef6cee8e4d0166b147275b19c286
parent1482f3ce3eb6daed7f68447c509ab022e484dd9a
Merge remote-tracking branch 'mjesec/master'

Conflicts:
src/ccid/ccid-driver.c
src/ccid/ccid-driver.c