git.somenet.org - pub/jan/aic18.git/commit

author	Sebastian Steiner <e1029038@student.tuwien.ac.at>
	Sun, 20 Jan 2019 16:42:56 +0000 (17:42 +0100)
committer	Sebastian Steiner <e1029038@student.tuwien.ac.at>
	Sun, 20 Jan 2019 16:42:56 +0000 (17:42 +0100)
commit	68c9f6a541c17a9bb1a46279ac56d6f59ade656d
tree	544a301c12d69b1257a82d15021d9beb1d78d273	tree \| snapshot
parent	bf23f64829390c96106ea7014545fdd2135557cd	commit \| diff
parent	0933e3054394db8cc13c8e66a353c25502615690	commit \| diff

Merge branch 'master' into '48-create-failover-service'

# Conflicts:
# g6t4.yml