Merge branch 'devel'
authorRalf Ertzinger <ralf@skytale.net>
Sat, 29 Jun 2013 14:42:45 +0000 (16:42 +0200)
committerRalf Ertzinger <ralf@skytale.net>
Sat, 29 Jun 2013 14:42:45 +0000 (16:42 +0200)
commit5420b8942fbbe6da34d37152f6079a5d98117596
treefcbeac8e80bcfeab3410aafe3d0ae19a9aef24fb
parent2ef5353face7a41eea1db9eba7d360e82573753c
parentafa7a5fdc46733dcf5d900cc008b2e7261888eac
Merge branch 'devel'