Norman Maurer 7fa861ab70 Synchronized between 4.1 and master
Motivation:

4 and 5 were diverged long time ago and we recently reverted some of the
early commits in master.  We must make sure 4.1 and master are not very
different now.

Modification:

Fix found differences

Result:

4.1 and master got closer.
2014-04-24 20:47:26 +02:00
..
2014-01-03 11:15:30 +01:00
2014-04-25 00:36:01 +09:00
2014-04-25 00:36:01 +09:00
2013-07-14 18:32:10 +02:00
2013-07-14 18:04:33 +02:00
2013-07-22 19:14:36 +02:00
2013-06-13 20:56:17 +02:00