Merge remote-tracking branch 'refs/remotes/origin/master' into neoView

Author Tyxz <arne@rantzen.net>
Author date 2016-06-03 19:30:27
Author local date 2016-06-03 21:30:27 +0200
Committer Tyxz <arne@rantzen.net>
Committer date 2016-06-03 19:30:27
Committer local date 2016-06-03 21:30:27 +0200
Commit d9ecd70fae20f122b13e92ef79d79c43ba4ab274
Tree 4184e11cdecf2716d2505a5efa4f84a8875cddda
Parent b86d1b720e304a689bf70b99fbd941a22bd37bd0
Parent 8ff9193882530cd1991ca41dcc0a1cd31b51f6a4
Merge remote-tracking branch 'refs/remotes/origin/master' into neoView

# Conflicts:
#	Clock.txt