The following commit has been merged in the merge/master branch: commit 27126f2b0e4a1321882737a52fba34bc61fdc078 Merge: f1f0fbb2c956863e8fe3c9528cb50a8cc4a270ea e2dd65cd88fcdc3445b7d5edf9fcc819ff58bd2e Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue May 17 17:13:23 2016 +0800
Merge branch 'next'