[mariadb/f21: 25/25] Merge branch 'master' into f21

[Honza Horak]

commit 7f2b8b9a31198c2db2ce976bb575cf9d959bb6ad
Merge: b311ebe d4c6e22
Author: Honza Horak <hhorak at redhat.com>
Date:   Thu Oct 2 10:51:57 2014 +0200

    Merge branch 'master' into f21
    
    Conflicts:
    	.gitignore

 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---