OSDN Git Service

Merge remote-tracking branch 'origin/maint' into maint
authorTheodore Ts'o <tytso@mit.edu>
Thu, 11 Sep 2014 16:26:27 +0000 (12:26 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 11 Sep 2014 16:26:27 +0000 (12:26 -0400)

Trivial merge