Merge branch 'akallabeth-fix_2036'
authorMartin Fleisz <martin.fleisz@thincast.com>
Thu, 11 Sep 2014 11:03:36 +0000 (13:03 +0200)
committerMartin Fleisz <martin.fleisz@thincast.com>
Thu, 11 Sep 2014 11:03:36 +0000 (13:03 +0200)
commitdb52eb14563781d86074ce3d444c49c01d0318e3
tree4463a1d04bb95125ebcf16afd6e36b7034560963
parentc3f49c307bcd1eff0465f7ded4d0e030b05ee72d
parent54b96290c90ec4ff3fe56a2a0994b0de49f12e56
Merge branch 'akallabeth-fix_2036'