From: Natanael Adityasatria <nata.adit@gmail.com>
Date: Thu, 7 Jan 2016 14:08:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=49495a0fe049791c0f45de4ac2177d45ca373265;p=des2015.git

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dsl/runtime/specs/wander.tdsl
---

49495a0fe049791c0f45de4ac2177d45ca373265