merge with master

Merge branch 'master' into f13
Conflicts: .gitignore
2010-12-18 21:33:17 +01:00 · 2010-12-18 21:29:17 +01:00 · 2010-07-29 15:29:44 +00:00 · 2010-02-17 03:28:15 +00:00
1 changed files with 0 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-wyrd-1.4.4.tar.gz
 /wyrd-1.4.5.tar.gz
Author	SHA1	Message	Date
Till Maas	f9aed339fe	merge with master	2010-12-18 21:33:17 +01:00
Till Maas	d44e12e677	Merge branch 'master' into f13 Conflicts: .gitignore	2010-12-18 21:29:17 +01:00
Fedora Release Engineering	7ecaff4b9a	dist-git conversion	2010-07-29 15:29:44 +00:00
Jesse Keating	d637b96046	Initialize branch F-13 for wyrd	2010-02-17 03:28:15 +00:00