Christoph Büscher 39667b5793 Merge branch 'master' into feature-suggest-refactoring
Conflicts:
	docs/reference/migration/migrate_5_0/java.asciidoc
2016-03-16 12:06:42 +01:00
..
2016-03-10 13:08:29 +01:00
2016-03-10 14:34:05 +01:00
2016-03-04 12:44:28 +01:00
2016-02-05 14:47:44 +01:00
2015-04-27 17:19:36 +02:00
2015-08-01 05:14:46 -04:00
2016-02-11 14:16:56 -08:00