Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Fri, 30 Aug 2013 22:37:29 +0000 (00:37 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Fri, 30 Aug 2013 22:37:29 +0000 (00:37 +0200)
commit847f582290c6ad6ec0c72760ea3cfa6417d28e3c
treec12baa61c649ec00e5fdfe35b1f88f0025d54f99
parentcd9c100963e8b8bf651d1f359e5f7812603ca0fd
parent10f5c016ec6262e5d29327e97fe4f3d1127ccdff
Merge remote-tracking branch 'upstream/master'