Merge branch 'feature/skylog_tnetstrings_via_udp' into develop
authormartinko <gamato@users.sf.net>
Wed, 10 Jul 2013 10:13:29 +0000 (12:13 +0200)
committermartinko <gamato@users.sf.net>
Wed, 10 Jul 2013 10:13:29 +0000 (12:13 +0200)

Trivial merge