Merge branch 'master' of https://git.dirt.kz/igor/GettextDB
# Conflicts: # nbproject/private/private.properties # nbproject/private/private.xml
This commit is contained in:
# Conflicts: # nbproject/private/private.properties # nbproject/private/private.xml