Permalink
Browse files

Merge branch 'master' into linkedin

Conflicts:
	contacts_import/urls.py
  • Loading branch information...
brosner committed Apr 13, 2010
2 parents 8b128f1 + d68c961 commit 00b0256e3bf1a16d6da289734d300ec894c4492c
Showing with 1 addition and 1 deletion.
  1. +1 −1 LICENSE
View
@@ -1,4 +1,4 @@
-Copyright (c) 2009, Eldarion, Inc.
+Copyright (c) 2009–2010, Eldarion, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,

0 comments on commit 00b0256

Please sign in to comment.