Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Mon, 26 Aug 2013 01:16:42 +0000 (03:16 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Mon, 26 Aug 2013 01:16:42 +0000 (03:16 +0200)
commit7a20e2e1f8ff0893e239aa2d855d8a00a510d769
tree379a8ea12e5a8396f91e7ce06b076e248ceb8cf4
parent5c6658d4dd5ea4f25e8ae8b62a47b09f164cd30b
parent90648143c315cc65b2449b72aec5025ff4e9ac17
Merge remote-tracking branch 'upstream/master'