The following commit has been merged in the merge/master branch: commit fff4c8303f5e09bed4cfdb45615a3b6b4cd70b6d Merge: e821b76b67a0adcbb807ee29c930bb43c3d434d8 071aadbb05e4f6ff1c25c5b1ef58f5158d31a8ac Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Aug 30 17:58:13 2015 +0800

Merge branch 'next'