Merge remote-tracking branch 'upstream/master'
authorpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 18 Apr 2016 15:41:50 +0000 (17:41 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Mon, 18 Apr 2016 15:41:50 +0000 (17:41 +0200)
commitfed146dbb3d924fd67cf297956635e738318b7f4
treea619cd08e01f4ea95e36d744c1805d6c69c9ebe4
parent3b9527f59c16a29d4fe0c74565a5ac82a21aed3a
parent0ef3877f096e85183a63298674736e14c46da1bd
Merge remote-tracking branch 'upstream/master'

Conflicts:
src/emuvim/dcemulator/resourcemodel/upb/simple.py
src/emuvim/dcemulator/resourcemodel/upb/simple.py