Merge remote-tracking branch 'gitorious/master'
authorThomas Kjeldahl Nilsson <thomas@gitorious.com>
Tue, 29 Jan 2013 13:42:20 +0000 (14:42 +0100)
committerThomas Kjeldahl Nilsson <thomas@gitorious.com>
Tue, 29 Jan 2013 13:42:20 +0000 (14:42 +0100)
commit3330406c796caa1f389d4cb58fe523be2a0d6a1a
tree4a72d9be64ae5fcbf5134f9602f4d0d6987ef6cc
parentb01f89bca8b647fee0a2b85986b81934b570f829
parent26ec94e51b1fa23d8381bf51d16d7ae21d0d32dc
Merge remote-tracking branch 'gitorious/master'