Merge branch 'features/annotations' of gitorious.org:gitorious/mainline into features...
authorChristian Johansen <christian@gitorious.org>
Fri, 26 Aug 2011 12:35:27 +0000 (14:35 +0200)
committerChristian Johansen <christian@gitorious.org>
Fri, 26 Aug 2011 12:35:27 +0000 (14:35 +0200)
commite96f78b4c86cadce2bc1c7da2de0cd46704f0f55
treea21168f143f1ab371469ee1c2b7d1367ebc61c91
parent64ac555a0185114243884d0a119b3ec0951baf40
parent5768424289fa8ea8a10fcb631bd6af1066d1dc09
Merge branch 'features/annotations' of gitorious.org:gitorious/mainline into features/annotations