From eb65125dda75d172c4e920e3d5da1f0d407415f9 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 27 Feb 2006 16:47:12 +0000
Subject: [PATCH] Add an entry for 308

---
 Misc/NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Misc/NEWS b/Misc/NEWS
index 2cc753f3cce..38468bf8035 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.5 alpha 1?
 Core and builtins
 -----------------
 
+- PEP 308: conditional expressions were added (x if cond else y).
+
 - Patch 1433928:
   - The copy module now "copies" function objects (as atomic objects).
   - dict.__getitem__ now looks for a __missing__ hook before raising