Merge branch 'master' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@gitorious.org>
Fri, 15 Jul 2011 07:18:06 +0000 (09:18 +0200)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 15 Jul 2011 07:18:06 +0000 (09:18 +0200)
commit0f1b24ad76d9d6b63eb78122dcbf980b8686ac08
treed19110eeab92f675aa701648690b76d1b1baedee
parent8ce7083c59fb74f2cb10db8ab453a385e80546f4
parentce7de03fc2cb6114d2f859fefc996e7fffa2d7f6
Merge branch 'master' of gitorious.org:gitorious/mainline