Merge branch 'tr-upgrade' into debian-upgrade
authorKevin Wasserman <kevin.wasserman@painless-security.com>
Thu, 26 Jun 2014 17:52:14 +0000 (13:52 -0400)
committerKevin Wasserman <kevin.wasserman@painless-security.com>
Thu, 26 Jun 2014 17:52:14 +0000 (13:52 -0400)
commit1ab71b24b5c71693c6f8b39a0f29a97776298258
tree549040720855fa3f5702cf51b11e7424870f604d
parentf6417939d1382be461908272f363aed4cbc5af52
parent6f753ec1d1dcc972af1c09a57d1c5d0735762d0f
Merge branch 'tr-upgrade' into debian-upgrade

Conflicts:
src/main/version.c
debian/control
src/main/version.c