Timo Stollenwerk 5f1a7fb5bc Merge branch 'master' into plip10359-z3cform
Conflicts:
	CHANGES.rst
2015-01-29 21:31:45 +01:00
..
2014-12-11 16:26:45 +01:00
2012-01-14 07:30:43 +01:00
2012-01-09 16:31:52 +01:00
2012-01-09 16:31:52 +01:00
2013-12-15 12:02:32 +01:00
2014-08-17 04:48:44 +02:00
2013-12-15 12:02:32 +01:00
2012-01-14 07:13:39 +01:00
2014-05-15 17:51:05 +02:00
2013-04-18 15:51:57 +02:00