From 6b91d2ef54d15ee56662859abaf0b4795f7293c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Thu, 6 Jan 2011 09:54:39 +0100
Subject: [PATCH] .gitignore from master

---
 .gitignore | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8a1aa7419..a773f8e3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,13 @@ phpmyadmin.wpj
 .settings
 .buildpath
 .cache
+.idea
 *.sw[op]
+# Locales
 locale
+# Backups
+*~
+# Javascript sources
+sources
+# API documentation
+apidoc