Merge branch 'features/annotations' of gitorious.org:gitorious/mainline into features...
authorChristian Johansen <christian@gitorious.org>
Thu, 25 Aug 2011 14:50:17 +0000 (16:50 +0200)
committerChristian Johansen <christian@gitorious.org>
Thu, 25 Aug 2011 14:50:17 +0000 (16:50 +0200)
commit1c80a669b2a21859ac7a71f58a477448816da0b8
tree6a433de523b793af68b7043d06c087d830fd4b90
parent96f68a006a0caf8ee8a6577bcf15191dcb21c76b
parent5b6457473f145db48252eb0f33b6049ed295a414
Merge branch 'features/annotations' of gitorious.org:gitorious/mainline into features/annotations