Merge remote-tracking branch 'gamato/develop'
authorMarko Kreen <markokr@gmail.com>
Wed, 19 Jun 2013 21:17:26 +0000 (00:17 +0300)
committerMarko Kreen <markokr@gmail.com>
Wed, 19 Jun 2013 21:17:26 +0000 (00:17 +0300)
1  2 
python/londiste/playback.py
python/londiste/setup.py

Simple merge
Simple merge