Merge branch 'hansiglaser-master'
authorClifford Wolf <clifford@clifford.at>
Tue, 19 Mar 2013 12:47:46 +0000 (13:47 +0100)
committerClifford Wolf <clifford@clifford.at>
Tue, 19 Mar 2013 12:47:46 +0000 (13:47 +0100)
commit0d39366e2ce9f7a23d47ae1191371ff305a08eb0
tree0093dadd88b796f71361599402bccbfc4c8024de
parent71de6660036c7cea95884554382bc2913af36252
parent9f10acb84042ce0943c3b4d1234efa3899f0dff1
Merge branch 'hansiglaser-master'