Fixing sample syntax and request for translation in ZH && KO [ci skip]
Merge branch 'master' of https://github.com/mybatis/mybatis-3.git
A test to check returning a LinkedHashMap.
wrong .xml file committed
change actitivy to "handling results", otherwise errors in result
handling show as "setting parameters"
Removed temporary fix for #117. Further discussion needed.
Include in first description of mapper the two ways mappers may be defined
Fix spacing
Merge pull request #266 from ajablonski/master

Update "Getting started" to mention two types of mappers as soon as mappers are mentioned
[releng] the keep attribute is making test fail because it removes
databases.** and domain.** test packages && derby upgraded
Merge branch 'master' of https://github.com/mybatis/mybatis-3.git
Travis does not like the last change. Refactor test classes to be inside
the org.apache.ibatis package.
Keep the docs as they were. [ci skip]