201404152000
201404152018
Merge branch 'master' of http://github.com/rydnr/queryj-rt

Some divergent changes in two different desktops.