Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@shortcut.no>
Thu, 12 Aug 2010 10:50:30 +0000 (12:50 +0200)
committerChristian Johansen <christian@shortcut.no>
Thu, 12 Aug 2010 10:50:30 +0000 (12:50 +0200)
commit0d1b12e55c16d78946c401e1c2207db403bf75ce
tree115a20754b5f845a92fda266720f476dc83fba50
parent1944a2525e0c46c07d221b59fba2f6cd265faa0c
parentda46d79cd823d459612f3fa325db8cafd4f10036
Merge branch 'master' of gitorious.org:gitorious/mainline