Merge branch 'master' of gitorious.org:gitorious/mainline
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Wed, 4 Apr 2012 10:41:56 +0000 (12:41 +0200)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Wed, 4 Apr 2012 10:41:56 +0000 (12:41 +0200)
commitd37e6fd2722db22dd087dbc820c15af555fd5c4a
treecc1aade42ea1c455267fd1381e6d72ea10944290
parent224b6c588235f7d62562261f36375bd0f1581d09
parent09d7d6159868657eeb0ac541407d2622c3ff4abc
Merge branch 'master' of gitorious.org:gitorious/mainline