Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Mon, 30 Jan 2012 08:48:35 +0000 (09:48 +0100)
committerChristian Johansen <christian@gitorious.org>
Mon, 30 Jan 2012 08:48:35 +0000 (09:48 +0100)
commit86251982e3a4ece30c8d6f653d8ae82489f4b47a
treec1a6b711086e45f6d1dd028cf7e911fd511cedc2
parent70e9afa97432a825247bcff08ad0f9d4d99a6243
parentcc2895edaab86ba1cce9591c219cc1f29142a242
Merge branch 'master' of gitorious.org:gitorious/mainline