Merge branch 'master' into test test
authorStricted <info@stricted.net>
Sun, 5 Feb 2017 12:26:05 +0000 (13:26 +0100)
committerStricted <info@stricted.net>
Sun, 5 Feb 2017 12:26:05 +0000 (13:26 +0100)
commit629170c702be2be196a9e63653356a137cf8ad9a
tree29dbb29d542940ea1d534141b03e15f2e9b70b6a
parentc2d6668a928dd9b986dc03865bd37cd8bf36c1e5
parentb0b2052a9244333bc2b88524dd088bb966e6ed7c
Merge branch 'master' into test

# Conflicts:
# README.md
# SpeedportHybrid.class.php
# Speedportw724v.class.php
# lib/trait/CryptLib.class.php
README.md
SpeedportHybrid.class.php
lib/trait/Login.class.php