Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Thu, 22 Aug 2013 12:04:30 +0000 (14:04 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Thu, 22 Aug 2013 12:04:30 +0000 (14:04 +0200)
commitadeb9c73d638090349243383eca0c3c7ebc1e6bc
treee1bd1f026f456264c0fed772475a4023f0429017
parent05a2926c5c7737e6f17ccf96a35a01ec05fe092b
parent4a55479fa9356098a0df4fc8192e6ebc9a0cd805
Merge remote-tracking branch 'upstream/master'