Merge branch 'master' of gitorious.org:hackspace-jena/hackerfahrschule
authorTim Schumacher <tim.daniel.schumacher@gmail.com>
Wed, 10 Oct 2012 21:36:01 +0000 (23:36 +0200)
committerTim Schumacher <tim.daniel.schumacher@gmail.com>
Wed, 10 Oct 2012 21:36:01 +0000 (23:36 +0200)
commit9c734520ca7ccf0062b7016f8f786399bed09a79
tree593fd3b450cb0eea1ba5e6e4130f1609a56492eb
parentae2f51bcc19ba0c46bb34d8e7592be442153290e
parent369b8cc2ed5918e18b0ba4e092ecc6f636e67c82
Merge branch 'master' of gitorious.org:hackspace-jena/hackerfahrschule