tree f24b84495c457fabe4cfe92c57334a770baa3b3f
parent ad441173490804d83cf6e7c917f1e5300470e3c4
parent 5a35e875a066f86ead66b031f4c0f08c916151f9
author Petr Michalec <epcim@apealive.net> 1505748499 +0200
committer GitHub <noreply@github.com> 1505748499 +0200

Merge branch 'sf-merge-test' into updates-for-andrew