Merge branch 'master' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@shortcut.no>
Tue, 8 Mar 2011 09:17:00 +0000 (10:17 +0100)
committerChristian Johansen <christian@shortcut.no>
Tue, 8 Mar 2011 09:17:00 +0000 (10:17 +0100)
commit7a73f9bda2994744ab8650f18a718c4859576221
tree8b8a95ac6842902742a8d890305170519acb93e9
parent66f8c0e44fabfed113ca27ff512a009cf6ff7888
parentdc32d5764447388683137683050269a8e4554469
Merge branch 'master' of gitorious.org:gitorious/mainline