Merge remote-tracking branch 'origin/master' into drizzle

[phpmyadmin.git] / js / display_triggers.js

/* vim: set expandtab sw=4 ts=4 sts=4: */