Merge remote-tracking branch 'upstream/master'

Conflicts:
	pumpio/pumpio.php
This commit is contained in:
Michael Vogel 2013-09-27 23:38:46 +02:00
commit 6d0e1ccf40

Diff content is not available