taglib/taglib — pull request #270 by TsudaKageyu (2013-09-07 04:17:16+00:00)
Title: Merge master

Merged ```master``` into ```taglib2```.
I have done this because the pull request #265 is a little complicated to merge.