Definitions of drollery:

• noun:   a quaint and amusing jest
• noun:   a comic incident or series of incidents