merge master in branch
commit33c3b3817b00aa9384760813643fac0e33daaaff
authorKlap-in <klapinklapin@gmail.com>
Sun, 14 Jul 2013 11:35:06 +0000 (14 13:35 +0200)
committerKlap-in <klapinklapin@gmail.com>
Sun, 14 Jul 2013 11:35:06 +0000 (14 13:35 +0200)
tree481c880b00a32ba5887834b52a17248bac8bfc7c
parent040f0e135c37c5b544f16277ff69205369df5f1f
parentfbd8067eeeb9f424981aad8b283e17f734c738c3
merge master in branch
inc/html.php
inc/lang/en/lang.php
inc/lang/nl/lang.php