Merge commit 'refs/merge-requests/163' of gitorious.org:gitorious/mainline into featu...
authorChristian Johansen <christian@gitorious.org>
Thu, 1 Sep 2011 11:31:48 +0000 (13:31 +0200)
committerChristian Johansen <christian@gitorious.org>
Thu, 1 Sep 2011 11:31:48 +0000 (13:31 +0200)
commita0cdba5e333e662c521639fd4486316a64296ff8
tree921924a423bec7e9f01d6988acfea96f892aa892
parenta348a1f2e209a17a5a8aee11f1f2e01f1e29d679
parent2548b99f57783a51370dce440f0c04b45257adda
Merge commit 'refs/merge-requests/163' of gitorious.org:gitorious/mainline into features/annotations