Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Mon, 14 Jan 2013 19:53:27 +0000 (20:53 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Mon, 14 Jan 2013 19:53:27 +0000 (20:53 +0100)
commit410bb3d7523e9db8b56cd435369fc210d7cc8157
treed32ef09554adb6fac323ad06a7f023ab49ad8ee3
parentf2a29506f1066b49129ae11d546a344f33ae37fc
parentd900caf387f1b8a824d877f45804162a4758b35d
Merge branch 'master' into radar

Conflicts:
autogen.sh
autogen.sh