Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Sat, 24 Aug 2013 21:01:39 +0000 (23:01 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Sat, 24 Aug 2013 21:01:39 +0000 (23:01 +0200)
commit5c6658d4dd5ea4f25e8ae8b62a47b09f164cd30b
tree1d96bd8eb6b4cb941ba11d8e80a961878ffb1cdc
parentadeb9c73d638090349243383eca0c3c7ebc1e6bc
parent9585f890f8c0eff70eb874c7962dc30baea1049c
Merge remote-tracking branch 'upstream/master'