Merge branch 'features/annotations' of gitorious.org:gitorious/mainline into features...
authorChristian Johansen <christian@gitorious.org>
Mon, 22 Aug 2011 15:18:32 +0000 (17:18 +0200)
committerChristian Johansen <christian@gitorious.org>
Mon, 22 Aug 2011 15:18:32 +0000 (17:18 +0200)
commitabf4ef1af3a7895a7363700bcf2a6a5af25c1b03
tree7681f1e99bf2c5132d9162cd9213a0e0721f9981
parent8374b49666b534b4a26e1f2bd9e8cb511ec3b2e8
parent6a9ec142cee66ccf39924a7ecdcf31e0e1d3bf14
Merge branch 'features/annotations' of gitorious.org:gitorious/mainline into features/annotations