Merge branch 'master' of gitorious.org:gitorious/mainline
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Tue, 18 Sep 2012 08:27:29 +0000 (10:27 +0200)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Tue, 18 Sep 2012 08:27:29 +0000 (10:27 +0200)
commit903489cf1737c0641774f378a3c7c192a80e3fb3
treed5b4185280b2156609b4bd9705d416bdb5ab620f
parentfa1d2358d4b95fa7c7504233c3850147efa96914
parent9de12b5529ff8e9b7f435bfdc6eceadfdaccb69a
Merge branch 'master' of gitorious.org:gitorious/mainline