Merge remote-tracking branch 'schwerkraft/master'
authorStephan Reichholf <reichi@opendreambox.org>
Fri, 5 Sep 2014 09:30:10 +0000 (11:30 +0200)
committerStephan Reichholf <reichi@opendreambox.org>
Fri, 5 Sep 2014 09:30:10 +0000 (11:30 +0200)
commit3a12b9d08b274a90891507529defd45f57c33a8f
treef8ae8816e57c148c32160f2796457eff55082d1d
parentd1bb884aed2088a44a7e85870e9feb70d2d5164b
parentc4bd16f63a6703a9672e91e6876477d4d18e80fa
Merge remote-tracking branch 'schwerkraft/master'