Merge remote-tracking branch 'snowleopard/master' into angerman/feature/advanced...
authorMoritz Angermann <moritz.angermann@gmail.com>
Fri, 15 Jan 2016 07:59:02 +0000 (15:59 +0800)
committerMoritz Angermann <moritz.angermann@gmail.com>
Fri, 15 Jan 2016 07:59:02 +0000 (15:59 +0800)
# Conflicts:
# src/Base.hs

1  2 
src/Rules/Actions.hs

Simple merge