Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Mon, 14 Jan 2013 20:00:46 +0000 (21:00 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Mon, 14 Jan 2013 20:00:46 +0000 (21:00 +0100)
commite17037ad462a6c05f5a73eddf1cff74a27f727a3
treed6bb2e888b0a947d16caf7a3de3a6ca40c920081
parent410bb3d7523e9db8b56cd435369fc210d7cc8157
parent058f9461c8e84851f7d8207e792fa1285377e85a
Merge branch 'master' into radar

Conflicts:
autogen.sh
autogen.sh