Sebastian Pipping 028d03456f Merge branch 'master' into display-threading ... Conflicts: client-barcode/freitagslib/network.py		2011-10-17 20:01:43 +02:00
..
colorama	Add colorama 0.2.4	2011-10-10 04:49:35 +02:00
doc	client-barcode: Turn "UNDO" into "STORNO" on howto sheet	2011-10-13 20:54:02 +02:00
freitagslib	better timeouts and the real url	2011-10-15 06:11:15 +02:00
freitagskasse.py	Merge branch 'master' into display-threading	2011-10-17 20:01:43 +02:00