tree 55fb27eda2931f318450f72fd89dd7e0d2a16a9f
parent 45b87000728ac61c086e70f78fb1f638f026fd4b
parent 76e4b334535223a07c0a8d93186a046b7d9818cb
author Piotr Krysik <ptrkrysik@gmail.com> 1505209520 +0200
committer Piotr Krysik <ptrkrysik@gmail.com> 1505209520 +0200

Merge branch 'fixeria/trx' into development

# Conflicts:
#	swig/grgsm_swig.i