[mlmmj/f13/master: 4/4] - Update to latest upstream - Drop CVE fix, merged upstream

[Michael Fleming]

commit 291525e7ea0903e0be758a0f17d5d145e312dbfd
Merge: 8275e8d 38f0d0c
Author: Michael Fleming <mfleming at thatfleminggent.com>
Date:   Fri Aug 27 20:02:55 2010 +1000

    - Update to latest upstream
    - Drop CVE fix, merged upstream

 .gitignore                            |    2 +-
 mlmmj.spec                            |   13 +++++++++-
 patch-mlmmj-php-admin-dirtravfix.diff |   38 +++++++++++++++++++++++++++++++++
 sources                               |    2 +-
 4 files changed, 51 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 3fe6306,73f9b51..edb6568
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--mlmmj-1.2.17.tar.bz2
+ /mlmmj-1.2.17.1.tar.bz2