Merge branch 'Nofre-master'
authorAndrew Karpow <andy@ndyk.de>
Sun, 20 Sep 2015 14:01:06 +0000 (16:01 +0200)
committerAndrew Karpow <andy@ndyk.de>
Sun, 20 Sep 2015 14:01:06 +0000 (16:01 +0200)
commit4295d1587446872688fe7fa307e33fbc586bc9bc
treea545d9aaea0602447ab236145179f6abca83d861
parent30b0b812f67a46483550bfb400b592cba68805b0
parent9f06699d3e2d148500edcd10f5b4cde1605cf100
Merge branch 'Nofre-master'