Merge branch 'eliasp-spiegel'
authorSergey M․ <dstftw@gmail.com>
Sat, 21 Jun 2014 09:32:01 +0000 (16:32 +0700)
committerSergey M․ <dstftw@gmail.com>
Sat, 21 Jun 2014 09:32:01 +0000 (16:32 +0700)

Trivial merge