Juan RP 1f91f41929 quasselclient: fix remaining file conflicts with quassel.		2014-12-02 14:54:26 +01:00
..
template	quasselclient: fix remaining file conflicts with quassel.	2014-12-02 14:54:26 +01:00