Merged changes from master
commit7d9f77fed1e57f3ddc6f3dc954793700d2b067e5
authorBastian Eicher <bastian@eicher.net>
Sat, 23 Jun 2012 09:50:32 +0000 (23 11:50 +0200)
committerBastian Eicher <bastian@eicher.net>
Sat, 23 Jun 2012 09:50:32 +0000 (23 11:50 +0200)
tree219163a619a5e4a081af53f8d9938eedd750a02e
parentcde0e921a57178a8ddbfd68e48c427f896100fb1
parent2591815ee927fb5e98d7e496a1b2c587a1292e13
Merged changes from master