Merge remote-tracking branch 'petr/consumer_refactor'
authorMarko Kreen <[email protected]>
Mon, 14 Jan 2013 09:34:42 +0000 (11:34 +0200)
committerMarko Kreen <[email protected]>
Mon, 14 Jan 2013 09:34:42 +0000 (11:34 +0200)

Trivial merge