Merge branch 'master' of gitorious.org:roslin/roslin
authorPiotr Szymaniak <szarpaj@grubelek.pl>
Tue, 13 Nov 2012 23:52:44 +0000 (00:52 +0100)
committerPiotr Szymaniak <szarpaj@grubelek.pl>
Tue, 13 Nov 2012 23:52:44 +0000 (00:52 +0100)
commit1c721995b5131209d4a8ea1183dc0eb4450f11c3
tree337ca155ca8ab07e372dda8a3449aa9a9b31c9bf
parent419ef7ebf16d9ea87fa431852c93eaf918ee66e3
parent055ba3429d551beb20fe490129bb85e55231370d
Merge branch 'master' of gitorious.org:roslin/roslin