Merge branch 'master' into terencehill/menu_languages 241/head
authorterencehill <piuntn@gmail.com>
Fri, 23 Oct 2015 18:47:30 +0000 (20:47 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 23 Oct 2015 18:47:30 +0000 (20:47 +0200)
commit3b8f792333c5c245e54bdf0612d2a442bcfe61dc
tree4e8496a77b6a4c3825fa16b98e8cec788e402798
parent7dcbea5a166ff42f4e034ca8accfb22fb05537ae
parent854aa1e1b32ede868207628b4924f96e9bfd3571
Merge branch 'master' into terencehill/menu_languages

Conflicts:
languages.txt
languages.txt